mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge branch 'PHP-8.2'
* PHP-8.2: Fix memory leak when setting an invalid DOMDocument encoding
This commit is contained in:
commit
807a05ee55
@ -140,7 +140,6 @@ int dom_document_encoding_read(dom_object *obj, zval *retval)
|
||||
zend_result dom_document_encoding_write(dom_object *obj, zval *newval)
|
||||
{
|
||||
xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj);
|
||||
zend_string *str;
|
||||
xmlCharEncodingHandlerPtr handler;
|
||||
|
||||
if (docp == NULL) {
|
||||
@ -148,11 +147,15 @@ zend_result dom_document_encoding_write(dom_object *obj, zval *newval)
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
str = zval_try_get_string(newval);
|
||||
if (UNEXPECTED(!str)) {
|
||||
return FAILURE;
|
||||
/* Typed property, can only be IS_STRING or IS_NULL. */
|
||||
ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING || Z_TYPE_P(newval) == IS_NULL);
|
||||
|
||||
if (Z_TYPE_P(newval) == IS_NULL) {
|
||||
goto invalid_encoding;
|
||||
}
|
||||
|
||||
zend_string *str = Z_STR_P(newval);
|
||||
|
||||
handler = xmlFindCharEncodingHandler(ZSTR_VAL(str));
|
||||
|
||||
if (handler != NULL) {
|
||||
@ -162,12 +165,14 @@ zend_result dom_document_encoding_write(dom_object *obj, zval *newval)
|
||||
}
|
||||
docp->encoding = xmlStrdup((const xmlChar *) ZSTR_VAL(str));
|
||||
} else {
|
||||
zend_value_error("Invalid document encoding");
|
||||
return FAILURE;
|
||||
goto invalid_encoding;
|
||||
}
|
||||
|
||||
zend_string_release_ex(str, 0);
|
||||
return SUCCESS;
|
||||
|
||||
invalid_encoding:
|
||||
zend_value_error("Invalid document encoding");
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
/* }}} */
|
||||
|
38
ext/dom/tests/gh12002.phpt
Normal file
38
ext/dom/tests/gh12002.phpt
Normal file
@ -0,0 +1,38 @@
|
||||
--TEST--
|
||||
GH-12002 (DOMDocument::encoding memory leak with invalid encoding)
|
||||
--EXTENSIONS--
|
||||
dom
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
function make_nonconst(string $x) {
|
||||
// Defeat SCCP, even with inlining
|
||||
return str_repeat($x, random_int(1, 1));
|
||||
}
|
||||
|
||||
$dom = new DOMDocument();
|
||||
$dom->encoding = make_nonconst('utf-8');
|
||||
var_dump($dom->encoding);
|
||||
try {
|
||||
$dom->encoding = make_nonconst('foobar');
|
||||
} catch (ValueError $e) {
|
||||
echo $e->getMessage(), "\n";
|
||||
}
|
||||
var_dump($dom->encoding);
|
||||
$dom->encoding = make_nonconst('utf-16le');
|
||||
var_dump($dom->encoding);
|
||||
try {
|
||||
$dom->encoding = NULL;
|
||||
} catch (ValueError $e) {
|
||||
echo $e->getMessage(), "\n";
|
||||
}
|
||||
var_dump($dom->encoding);
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
string(5) "utf-8"
|
||||
Invalid document encoding
|
||||
string(5) "utf-8"
|
||||
string(8) "utf-16le"
|
||||
Invalid document encoding
|
||||
string(8) "utf-16le"
|
Loading…
Reference in New Issue
Block a user