com php-src: Revert "fix #72155 (use-after-free caused by get_zval_xmlrpc_type)": ext/xmlrpc/xmlrpc-epi-php .c

From: Date: Tue, 31 May 2016 03:32:09 +0000
Subject: com php-src: Revert "fix #72155 (use-after-free caused by get_zval_xmlrpc_type)": ext/xmlrpc/xmlrpc-epi-php .c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92249@lists.php.net to get a copy of this message
Commit: a811b5e38d9ccbbce70658c9bc59515bf9208019 Author: Xinchen Hui <laruence@gmail.com> Tue, 31 May 2016 11:32:09 +0800 Parents: 2524ab9e67554f1de3c343ed7eb11eee0c92a093 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a811b5e38d9ccbbce70658c9bc59515bf9208019 Log: Revert "fix #72155 (use-after-free caused by get_zval_xmlrpc_type)" This reverts commit 1690dcb827e2b50eb575b1c6acadab0b8f248723. Bugs: https://bugs.php.net/72155 Changed paths: M ext/xmlrpc/xmlrpc-epi-php.c Diff: diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 8daf262..ea62bdc 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); } } }

« previous php.cvs (#92249) next »