fix #72155 (use-after-free caused by get_zval_xmlrpc_type)

This commit is contained in:
Joe Watkins 2016-05-30 08:56:50 +01:00
parent 0c5bd4d445
commit 1690dcb827
2 changed files with 5 additions and 2 deletions

3
NEWS
View file

@ -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:

View 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_VALUE(newvalue, val);
ZVAL_COPY(newvalue, val);
}
} else {
ZVAL_COPY_VALUE(newvalue, value);
ZVAL_COPY(newvalue, value);
}
}
}