Fix and improve string token parsing

sirreal · Dec 5, 2024 · 15c07b3 · 15c07b3
1 parent e60384d
commit 15c07b3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/src/wp-includes/html-api/class-wp-css-compound-selector-list.php b/src/wp-includes/html-api/class-wp-css-compound-selector-list.php
@@ -548,7 +548,7 @@ final protected static function parse_ident( string $input, int &$offset ): ?str
 	 * @return string|null
 	 */
 	final protected static function parse_string( string $input, int &$offset ): ?string {
-		if ( $offset + 1 >= strlen( $input ) ) {
+		if ( $offset >= strlen( $input ) ) {
 			return null;
 		}
 
@@ -559,8 +559,19 @@ final protected static function parse_string( string $input, int &$offset ): ?st
 
 		$string_token = '';
 
-		$updated_offset = $offset + 1;
+		$updated_offset     = $offset + 1;
+		$anything_else_mask = "\\\n{$ending_code_point}";
 		while ( $updated_offset < strlen( $input ) ) {
+			$anything_else_length = strcspn( $input, $anything_else_mask, $updated_offset );
+			if ( $anything_else_length > 0 ) {
+				$string_token   .= substr( $input, $updated_offset, $anything_else_length );
+				$updated_offset += $anything_else_length;
+
+				if ( $updated_offset >= strlen( $input ) ) {
+					break;
+				}
+			}
+
 			switch ( $input[ $updated_offset ] ) {
 				case '\\':
 					++$updated_offset;
@@ -587,10 +598,6 @@ final protected static function parse_string( string $input, int &$offset ): ?st
 				case $ending_code_point:
 					++$updated_offset;
 					break 2;
-
-				default:
-					$string_token .= $input[ $updated_offset ];
-					++$updated_offset;
 			}
 		}
 

diff --git a/tests/phpunit/tests/html-api/wpCssCompoundSelectorList.php b/tests/phpunit/tests/html-api/wpCssCompoundSelectorList.php
@@ -181,13 +181,16 @@ public static function data_strings(): array {
 
 			"'foo\\"                  => array( "'foo\\", 'foo', '' ),
 
+			'"'                       => array( '"', '', '' ),
+			'"\\"'                    => array( '"\\"', '"', '' ),
+			'"missing close'          => array( '"missing close', 'missing close', '' ),
+
 			// Invalid
 			'Invalid: (empty string)' => array( '' ),
-			"Invalid: 'newline\\n'"   => array( "'newline\n'" ),
-			'Invalid: foo'            => array( 'foo' ),
-			'Invalid: \\"'            => array( '\\"' ),
 			'Invalid: .foo'           => array( '.foo' ),
 			'Invalid: #foo'           => array( '#foo' ),
+			"Invalid: 'newline\\n'"   => array( "'newline\n'" ),
+			'Invalid: foo'            => array( 'foo' ),
 		);
 	}