com php-src: PDO code assumes that different parts of the union alligned in special way: ext/pdo/php_pdo_driver.h

From: Date: Mon, 05 May 2014 22:02:00 +0000
Subject: com php-src: PDO code assumes that different parts of the union alligned in special way: ext/pdo/php_pdo_driver.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78109@lists.php.net to get a copy of this message 
Commit:    1606a9a36a40423008615e2fe1c8a465e8c99747
Author:    Dmitry Stogov <dmitry@zend.com>         Tue, 6 May 2014 02:02:00 +0400
Parents:   211d32c81429730e2692c65577d021616a525726
Branches:  phpng

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=1606a9a36a40423008615e2fe1c8a465e8c99747

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

Changed paths:
  M  ext/pdo/php_pdo_driver.h


Diff:
diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
index 6a0faaa..0326eaa 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;

Thread (1 message)

  • Dmitry Stogov
« previous php.cvs (#78109) next »