Skip to content

Encoding: Fix _wp_scan_utf8() budget scanning #49

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

Open
sirreal wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Encoding: Fix _wp_scan_utf8() budget scanning #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ca76c8
Charset: Limit UTF-8 ASCII scan to code point budget
sirreal Jun 11, 2026
a70518d
Tests: Refine UTF-8 code point span docs
sirreal Jun 11, 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/compat-utf8.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function _wp_scan_utf8( string $bytes, int &$at, int &$invalid_length, ?int $max
"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f" .
" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f",
$i,
$end - $i
min( $end - $i, $max_count - $count )
);

if ( $count + $ascii_byte_count >= $max_count ) {
Expand Down
100 changes: 100 additions & 0 deletions tests/phpunit/tests/compat/wpUtf8CodePointSpan.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?php
/**
* Unit tests covering fallback UTF-8 code-point span detection.
*
* @package WordPress
* @subpackage Charset
*
* @group compat
*
* @covers ::_wp_utf8_codepoint_span()
*/
class Tests_Compat_wpUtf8CodePointSpan extends WP_UnitTestCase {
/**
* Ensures that the span accounts for the requested number of code points.
*
* @dataProvider data_codepoint_spans
*
* @param string $text
* @param int $byte_offset
* @param int $max_code_points
* @param int $expected_span
* @param int $expected_found
*/
public function test_finds_codepoint_spans( string $text, int $byte_offset, int $max_code_points, int $expected_span, int $expected_found ) {
$found_code_points = null;

$this->assertSame(
$expected_span,
_wp_utf8_codepoint_span( $text, $byte_offset, $max_code_points, $found_code_points ),
'Should have found the expected byte span.'
);

$this->assertSame(
$expected_found,
$found_code_points,
'Should have reported the expected number of code points.'
);
}

/**
* Data provider.
*
* @return array<string, array{0: string, 1: int, 2: int, 3: int, 4: int}>
*/
public static function data_codepoint_spans() {
$long_ascii_run = str_repeat( 'a', 1024 );

return array(
'zero code point budget' => array(
'abcdef',
0,
0,
0,
0,
),
'long ASCII run at start' => array(
$long_ascii_run,
0,
5,
5,
5,
),
'long ASCII run from non-zero offset' => array(
"zz{$long_ascii_run}",
2,
5,
5,
5,
),
'multibyte character before the boundary' => array(
"ab\u{1F170}cd",
0,
2,
2,
2,
),
'multibyte character at the boundary' => array(
"ab\u{1F170}cd",
0,
3,
strlen( "ab\u{1F170}" ),
3,
),
'invalid span after the boundary' => array(
"ab\xF0\x9Fzz",
0,
2,
2,
2,
),
'invalid span at the boundary' => array(
"ab\xF0\x9Fzz",
0,
3,
4,
3,
),
);
}
}
Loading