archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  Fix missing deref in C14N (#14203)
This commit is contained in:
Niels Dossche 2024-05-11 17:13:12 +02:00
commit 59f16223ae
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/dom/node.c
View file

@ -1874,6 +1874,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
inclusive_ns_prefixes = safe_emalloc(zend_hash_num_elements(Z_ARRVAL_P(ns_prefixes)) + 1, inclusive_ns_prefixes = safe_emalloc(zend_hash_num_elements(Z_ARRVAL_P(ns_prefixes)) + 1,
sizeof(xmlChar *), 0); sizeof(xmlChar *), 0);
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(ns_prefixes), tmpns) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(ns_prefixes), tmpns) {
ZVAL_DEREF(tmpns);
if (Z_TYPE_P(tmpns) == IS_STRING) { if (Z_TYPE_P(tmpns) == IS_STRING) {
inclusive_ns_prefixes[nscount++] = (xmlChar *) Z_STRVAL_P(tmpns); inclusive_ns_prefixes[nscount++] = (xmlChar *) Z_STRVAL_P(tmpns);
} }

2
ext/dom/tests/DOMNode_C14N_references.phpt
View file

@ -38,4 +38,4 @@ unset($v);
echo $doc->C14N(true, false, $xpath, $prefixes); echo $doc->C14N(true, false, $xpath, $prefixes);
?> ?>
--EXPECT-- --EXPECT--
<contain xmlns="http://www.example.com/ns/foo"><bar></bar><bar></bar></contain> <contain xmlns="http://www.example.com/ns/foo" xmlns:test="urn::test"><bar></bar><bar></bar></contain>