From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 5 May 2014 22:02:00 +0000 (+0400)
Subject: PDO code assumes that different parts of the union alligned in special way
X-Git-Tag: POST_PHPNG_MERGE~410^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1606a9a36a40423008615e2fe1c8a465e8c99747;p=php

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 6a0faaa121..0326eaa5a1 100644
--- 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;