WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Formatting: Check the result of `preg_split()` in `convert_smilies()`. 

This aims to avoid a fatal error from `count()` when `preg_split()` fails on large input.

Includes:
* Optimizing the regular expression used to split the input by tags to avoid unlimited backtracking for better performance.
* Adjusting the function logic for better readability.

Follow-up to [340], [4380], [26191].

Props podpirate, nathkrill, rajinsharwar, dmsnell, bjorsch, q0rban, audrasjb, rupw, Ov3rfly, jorbin, nhrrob, chaion07, mcqueen22, azaozz, narenin, roybellingan, SergeyBiryukov.
See #51019.
Built from https://develop.svn.wordpress.org/trunk@59515


git-svn-id: http://core.svn.wordpress.org/trunk@58901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2024-12-14 23:53:24 +00:00
parent cc3c3bf4e6
commit 57e024a157
2 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wp-includes/formatting.php
View File

@ -3473,11 +3473,23 @@ function translate_smiley( $matches ) {
*/ */
function convert_smilies( $text ) { function convert_smilies( $text ) {
global $wp_smiliessearch; global $wp_smiliessearch;
$output = '';
if ( get_option( 'use_smilies' ) && ! empty( $wp_smiliessearch ) ) { if ( ! get_option( 'use_smilies' ) || empty( $wp_smiliessearch ) ) {
// Return default text.
return $text;
}
// HTML loop taken from texturize function, could possible be consolidated. // HTML loop taken from texturize function, could possible be consolidated.
$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // Capture the tags as well as in between. $textarr = preg_split( '/(<[^>]*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // Capture the tags as well as in between.
$stop = count( $textarr ); // Loop stuff.
if ( false === $textarr ) {
// Return default text.
return $text;
}
// Loop stuff.
$stop = count( $textarr );
$output = '';
// Ignore processing of specific tags. // Ignore processing of specific tags.
$tags_to_ignore = 'code|pre|style|script|textarea'; $tags_to_ignore = 'code|pre|style|script|textarea';
@ -3503,10 +3515,7 @@ function convert_smilies( $text ) {
$output .= $content; $output .= $content;
} }
} else {
// Return default text.
$output = $text;
}
return $output; return $output;
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.8-alpha-59514'; $wp_version = '6.8-alpha-59515';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.