PDO code assumes that different parts of the union alligned in special way

diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
index 6a0faaa121dd7830eb1d02423ff44ac5f0f60922..0326eaa5a128a3a42a48adbfb44845dbbca47448 100644 (file)
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
@@ -605,19 +605,18 @@ struct _pdo_stmt_t {
        union {
                int column;
                struct {
-                       zend_class_entry *ce;   
-                       void *_reserved;
                        zval ctor_args;            /* freed */
-                       zval retval; 
                        zend_fcall_info fci;
                        zend_fcall_info_cache fcc;
+                       zval retval; 
+                       zend_class_entry *ce;   
                } cls;
                struct {
-                       zval function;
                        zval fetch_args;           /* freed */
-                       zval object;
                        zend_fcall_info fci;
                        zend_fcall_info_cache fcc;
+                       zval object;
+                       zval function;
                        zval *values;              /* freed */
                } func;
                zval into;