Skip to content

HTML API: avoid processing incomplete tokens #5725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dmsnell wants to merge 4 commits into from
+557 −114
Closed

HTML API: avoid processing incomplete tokens #5725

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35502ad
HTML API: Avoid processing incomplete syntax elements.
dmsnell Dec 10, 2023
c3166be
Add ticket number
dmsnell Dec 20, 2023
9e7167a
HTML API: Prevent out-of-bounds string access.
dmsnell Dec 20, 2023
8488317
Fix bug found from HTML5Tests for incomplete SCRIPT tag closer
dmsnell Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix bug found from HTML5Tests for incomplete SCRIPT tag closer 
Co-authored-by: Jon Surrell <[email protected]>
  • Loading branch information
@dmsnell @sirreal
dmsnell and sirreal committed Dec 20, 2023
commit 848831789eafb6962d529a74c43531bae01224c7
8 changes: 7 additions & 1 deletion src/wp-includes/html-api/class-wp-html-tag-processor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,12 @@ private function skip_script_data() {
continue;
}

if ( $this->bytes_already_parsed >= $doc_length ) {
$this->parser_state = self::STATE_INCOMPLETE;

return false;
}

if ( '>' === $html[ $this->bytes_already_parsed ] ) {
$this->bytes_already_parsed = $closer_potentially_starts_at;
return true;
Expand Down Expand Up @@ -1362,7 +1368,7 @@ private function parse_next_tag() {
* https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
*/
if (
strlen( $html ) > $at + 3 &&
$doc_length > $at + 3 &&
'-' === $html[ $at + 2 ] &&
'-' === $html[ $at + 3 ]
) {
Expand Down