diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-05-31 11:32:09 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-05-31 11:32:09 +0800 |
| commit | a811b5e38d9ccbbce70658c9bc59515bf9208019 (patch) | |
| tree | 02633b0e1a97fc6caa0736ffba12950e38434ab2 /ext/xmlrpc | |
| parent | 2524ab9e67554f1de3c343ed7eb11eee0c92a093 (diff) | |
| download | php-git-a811b5e38d9ccbbce70658c9bc59515bf9208019.tar.gz | |
Revert "fix #72155 (use-after-free caused by get_zval_xmlrpc_type)"
This reverts commit 1690dcb827e2b50eb575b1c6acadab0b8f248723.
Diffstat (limited to 'ext/xmlrpc')
| -rw-r--r-- | ext/xmlrpc/xmlrpc-epi-php.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 8daf26257e..ea62bdc9a9 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -1368,10 +1368,10 @@ XMLRPC_VALUE_TYPE get_zval_xmlrpc_type(zval* value, zval* newvalue) /* {{{ */ if ((type == xmlrpc_base64 && Z_TYPE_P(value) == IS_OBJECT) || type == xmlrpc_datetime) { if ((val = zend_hash_str_find(Z_OBJPROP_P(value), OBJECT_VALUE_ATTR, sizeof(OBJECT_VALUE_ATTR) - 1)) != NULL) { - ZVAL_COPY(newvalue, val); + ZVAL_COPY_VALUE(newvalue, val); } } else { - ZVAL_COPY(newvalue, value); + ZVAL_COPY_VALUE(newvalue, value); } } } |