Browse Source

Merge branch 'PHP-7.0'

* PHP-7.0:
  fix #72155 (use-after-free caused by get_zval_xmlrpc_type)
pull/1928/head
Joe Watkins 10 years ago
parent
commit
9de481fe0d
  1. 4
      ext/xmlrpc/xmlrpc-epi-php.c

4
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);
}
}
}

Loading…
Cancel
Save