Merge branch 'PHP-8.5'

ndossche · ndossche · commit f5024930ccc3 · 2025-11-13T00:04:04.000+01:00
* PHP-8.5:
  dom: Fix missing NUL byte check on C14NFile()
diff --git a/ext/dom/node.c b/ext/dom/node.c
@@ -2126,7 +2126,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
 		}
 	} else {
 		if (zend_parse_parameters(ZEND_NUM_ARGS(),
-			"s|bba!a!", &file, &file_len, &exclusive,
+			"p|bba!a!", &file, &file_len, &exclusive,
 			&with_comments, &xpath_array, &ns_prefixes) == FAILURE) {
 			RETURN_THROWS();
 		}

Original file line number	Diff line number	Diff line change
`@@ -2126,7 +2126,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{`
`2126`	`2126`	`}`
`2127`	`2127`	`} else {`
`2128`	`2128`	`if (zend_parse_parameters(ZEND_NUM_ARGS(),`
`2129`		`- "s\|bba!a!", &file, &file_len, &exclusive,`
	`2129`	`+ "p\|bba!a!", &file, &file_len, &exclusive,`
`2130`	`2130`	`&with_comments, &xpath_array, &ns_prefixes) == FAILURE) {`
`2131`	`2131`	`RETURN_THROWS();`
`2132`	`2132`	`}`