Fix phpGH-17486: Incorrect error line numbers reported in Dom\HTMLDocument::createFromString

ndossche · ndossche · commit 21c170c75af6 · 2025-01-17T16:24:28.000+01:00
Closes phpGH-17491.
diff --git a/NEWS b/NEWS
@@ -19,6 +19,8 @@ PHP                                                                        NEWS
 
 - DOM:
   . Fixed bug GH-17397 (Assertion failure ext/dom/php_dom.c). (nielsdos)
+  . Fixed bug GH-17486 (Incorrect error line numbers reported in
+    Dom\HTMLDocument::createFromString). (nielsdos)
 
 - Enchant:
   . Fix crashes in enchant when passing null bytes. (nielsdos)
diff --git a/ext/dom/html_document.c b/ext/dom/html_document.c
@@ -880,6 +880,13 @@ PHP_METHOD(Dom_HTMLDocument, createFromString)
 		if (!result) {
 			goto fail_oom;
 		}
+
+		/* In the string case we have a single buffer that acts as a sliding window.
+		 * The `current_input_characters` field starts pointing at the start of the buffer, but needs to slide along the
+		 * sliding window as well. */
+		if (application_data.current_input_characters) {
+			application_data.current_input_characters += chunk_size;
+		}
 	}
 
 	if (!dom_parse_decode_encode_finish(&ctx, document, parser, &decoding_encoding_ctx, &tokenizer_error_offset, &tree_error_offset)) {
diff --git a/ext/dom/tests/modern/html/parser/gh17486.phpt b/ext/dom/tests/modern/html/parser/gh17486.phpt
@@ -0,0 +1,39 @@
+--TEST--
+GH-17486 (Incorrect error line numbers reported in Dom\HTMLDocument::createFromString)
+--EXTENSIONS--
+dom
+--INI--
+error_reporting=E_ALL
+--CREDITS--
+xPaw
+--FILE--
+<?php
+
+$repeated = str_repeat('a', 50000);
+
+$html = <<<HTML
+<!DOCTYPE html>
+<html lang="en">
+	<body>
+		<svg>
+			<path d="{$repeated}" />
+		</svg>
+		<div>&#x0;</div>
+	</body>
+</html>
+HTML;
+
+\Dom\HTMLDocument::createFromString($html);
+
+file_put_contents(__DIR__ . '/gh17486.tmp', $html);
+\Dom\HTMLDocument::createFromFile(__DIR__ . '/gh17486.tmp');
+
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/gh17486.tmp');
+?>
+--EXPECTF--
+Warning: Dom\HTMLDocument::createFromString(): tokenizer error null-character-reference in Entity, line: 7, column: 9 in %s on line %d
+
+Warning: Dom\HTMLDocument::createFromFile(): tokenizer error null-character-reference in %s line: 7, column: 9 in %s on line %d

Original file line number	Diff line number	Diff line change
`@@ -880,6 +880,13 @@ PHP_METHOD(Dom_HTMLDocument, createFromString)`
`880`	`880`	`if (!result) {`
`881`	`881`	`goto fail_oom;`
`882`	`882`	`}`
	`883`	`+`
	`884`	`+ /* In the string case we have a single buffer that acts as a sliding window.`
	`885`	+ * The `current_input_characters` field starts pointing at the start of the buffer, but needs to slide along the
	`886`	`+ * sliding window as well. */`
	`887`	`+ if (application_data.current_input_characters) {`
	`888`	`+ application_data.current_input_characters += chunk_size;`
	`889`	`+ }`
`883`	`890`	`}`
`884`	`891`
`885`	`892`	`if (!dom_parse_decode_encode_finish(&ctx, document, parser, &decoding_encoding_ctx, &tokenizer_error_offset, &tree_error_offset)) {`