com php-src: fix #72155 (use-after-free caused by get_zval_ xmlrpc_type): NEWS ext/xmlrpc/xmlrpc-epi-php.c
| From: | Joe Watkins | Date: | Mon, 30 May 2016 07:56:50 +0000 |
| Subject: | com php-src: fix #72155 (use-after-free caused by get_zval_ xmlrpc_type): NEWS ext/xmlrpc/xmlrpc-epi-php.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92235@lists.php.net to get a copy of this message | ||
Commit: 1690dcb827e2b50eb575b1c6acadab0b8f248723
Author: Joe Watkins <krakjoe@php.net> Mon, 30 May 2016 08:56:50 +0100
Parents: 0c5bd4d445ab09fd457882c06eff436eebb4c9bf
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1690dcb827e2b50eb575b1c6acadab0b8f248723
Log:
fix #72155 (use-after-free caused by get_zval_xmlrpc_type)
Bugs:
https://bugs.php.net/72155
Changed paths:
M NEWS
M ext/xmlrpc/xmlrpc-epi-php.c
Diff:
diff --git a/NEWS b/NEWS
index 69ae578..9aa71bd 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,9 @@ PHP NEWS
- XML:
. Fixed #72206 (xml_parser_create/xml_parser_free leaks mem). (Joe)
+- XMLRPC:
+ . Fixed #72155 (use-after-free caused by get_zval_xmlrpc_type). (Joe)
+
26 May 2016 PHP 7..0.7
- Core:
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index ea62bdc..8daf262 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_VALUE(newvalue, val);
+ ZVAL_COPY(newvalue, val);
}
} else {
- ZVAL_COPY_VALUE(newvalue, value);
+ ZVAL_COPY(newvalue, value);
}
}
}