Skip to content

Commit abad39a

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: dom: Fix missing NUL byte check on C14NFile()
2 parents f996abd + a103251 commit abad39a

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ PHP NEWS
1212
(ndossche)
1313
. Fixed bug GH-20395 (querySelector and querySelectorAll requires elements
1414
in $selectors to be lowercase). (ndossche)
15+
. Fix missing NUL byte check on C14NFile(). (ndossche)
1516

1617
- Opcache:
1718
. Fixed bug GH-20329 (opcache.file_cache broken with full interned string

ext/dom/node.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2126,7 +2126,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
21262126
}
21272127
} else {
21282128
if (zend_parse_parameters(ZEND_NUM_ARGS(),
2129-
"s|bba!a!", &file, &file_len, &exclusive,
2129+
"p|bba!a!", &file, &file_len, &exclusive,
21302130
&with_comments, &xpath_array, &ns_prefixes) == FAILURE) {
21312131
RETURN_THROWS();
21322132
}

0 commit comments

Comments
 (0)