]> granicus.if.org Git - php/commitdiff
Revert "fix #72155 (use-after-free caused by get_zval_xmlrpc_type)"
authorXinchen Hui <laruence@gmail.com>
Tue, 31 May 2016 03:32:09 +0000 (11:32 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 31 May 2016 03:32:09 +0000 (11:32 +0800)
This reverts commit 1690dcb827e2b50eb575b1c6acadab0b8f248723.

ext/xmlrpc/xmlrpc-epi-php.c

index 8daf26257e5be8c76d4aa1373e5d0542cc5192d0..ea62bdc9a9000cdf2c527ae419e64cc13ea220a1 100644 (file)
@@ -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);
                        }
                }
        }