Skip to content

HTML API: Preserve decoder match length on named-reference miss #66

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
sirreal wants to merge 6 commits into from
Closed

HTML API: Preserve decoder match length on named-reference miss #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b47c0c
Preserve decoder match length on named-reference miss
sirreal Jun 12, 2026
200c779
Merge remote-tracking branch 'upstream/trunk' into HEAD
sirreal Jun 15, 2026
9ca89d1
Fix coding standards for decoder token-map tests
sirreal Jun 15, 2026
3426c75
Merge remote-tracking branch 'upstream/trunk' into fix/html-decoder-t…
sirreal Jul 1, 2026
674d0dc
ticket in tests
sirreal Jul 1, 2026
d1942e5
Improve types in tests
sirreal Jul 1, 2026
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
2 changes: 1 addition & 1 deletion src/wp-includes/html-api/class-wp-html-decoder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ public static function read_character_reference( $context, $text, $at = 0, &$mat

$name_length = 0;
$replacement = $html5_named_character_references->read_token( $text, $name_at, $name_length );
if ( false === $replacement ) {
if ( null === $replacement ) {
return null;
}

Expand Down
33 changes: 33 additions & 0 deletions tests/phpunit/tests/html-api/wpHtmlDecoder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,39 @@ static function ( int $errno, string $errstr ) use ( &$errors ) {
$this->assertSame( "&\x00b", $decoded, 'Should have decoded the text without changing it.' );
}

/**
* Ensures unmatched named character references leave the by-ref match length unchanged.
*

@dmsnell dmsnell Jul 1, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ticket 65372

* @dataProvider data_unmatched_named_character_references
*
* @ticket 65372
*
* @param string $context Decoder context.
* @param string $raw_text_node Raw text containing an unmatched named character reference.
*/
public function test_unmatched_named_character_reference_does_not_set_match_byte_length( $context, $raw_text_node ): void {
$match_byte_length = 'sentinel';
$this->assertNull(
WP_HTML_Decoder::read_character_reference( $context, $raw_text_node, 0, $match_byte_length ),
'Should not have matched an unmatched named character reference.'
);
$this->assertSame( 'sentinel', $match_byte_length );
}

/**
* Data provider.
*
* @return array<string, array{string, string}>.
*/
public static function data_unmatched_named_character_references(): array {
return array(
'text invalid name' => array( 'data', '&bogus;' ),
'text invalid short-name candidate' => array( 'data', '&Fv=q' ),
'attribute invalid name' => array( 'attribute', '&bogus;' ),
'attribute invalid short-name candidate' => array( 'attribute', '&Fv=q' ),
);
}

/**
* Ensures semicolonless legacy references decode before non-ASCII UTF-8 bytes in attributes.
*
Expand Down
Loading