summaryrefslogtreecommitdiff
path: root/ext/pdo
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-05-06 02:02:00 +0400
committerDmitry Stogov <dmitry@zend.com>2014-05-06 02:02:00 +0400
commit1606a9a36a40423008615e2fe1c8a465e8c99747 (patch)
tree7c2e4b813d7c006d6489df95b1a32279fb68c2d0 /ext/pdo
parent211d32c81429730e2692c65577d021616a525726 (diff)
downloadphp-git-1606a9a36a40423008615e2fe1c8a465e8c99747.tar.gz
PDO code assumes that different parts of the union alligned in special way
Diffstat (limited to 'ext/pdo')
-rw-r--r--ext/pdo/php_pdo_driver.h9
1 files changed, 4 insertions, 5 deletions
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;