-
Notifications
You must be signed in to change notification settings - Fork 8k
Forbid \C in UTF-8 patterns #21139
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.
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
base: PHP-8.4
Are you sure you want to change the base?
Forbid \C in UTF-8 patterns #21139
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -734,6 +734,8 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, bo | |||||||||||||||||||||||||||
| #ifdef PCRE2_UCP | ||||||||||||||||||||||||||||
| coptions |= PCRE2_UCP; | ||||||||||||||||||||||||||||
| #endif | ||||||||||||||||||||||||||||
| /* The \C escape sequence is unsafe in PCRE2_UTF mode */ | ||||||||||||||||||||||||||||
| coptions |= PCRE2_NEVER_BACKSLASH_C; | ||||||||||||||||||||||||||||
| break; | ||||||||||||||||||||||||||||
| case 'J': coptions |= PCRE2_DUPNAMES; break; | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
|
|
@@ -787,7 +789,11 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, bo | |||||||||||||||||||||||||||
| if (key != regex) { | ||||||||||||||||||||||||||||
| zend_string_release_ex(key, 0); | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
| pcre2_get_error_message(errnumber, error, sizeof(error)); | ||||||||||||||||||||||||||||
| if (errnumber == PCRE2_ERROR_BACKSLASH_C_CALLER_DISABLED) { | ||||||||||||||||||||||||||||
| strlcpy((char*)error, "using \\C is incompatible with the 'u' modifier", sizeof(error)); | ||||||||||||||||||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes the default message is a bit vague in this context, makes sense. |
||||||||||||||||||||||||||||
| } else { | ||||||||||||||||||||||||||||
| pcre2_get_error_message(errnumber, error, sizeof(error)); | ||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||
| php_error_docref(NULL,E_WARNING, "Compilation failed: %s at offset %zu", error, erroffset); | ||||||||||||||||||||||||||||
|
Comment on lines
+792
to
797
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the strlcpy call is ugly, but I won't object. Why not smth like this (and possibly rename error to error_buf):
Suggested change
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. on that, I was surprised to see pcre2 provides a strcpy-like only for their own buffer type. |
||||||||||||||||||||||||||||
| pcre_handle_exec_error(PCRE2_ERROR_INTERNAL); | ||||||||||||||||||||||||||||
| efree(pattern); | ||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| --TEST-- | ||
| GH-21134: ASan negative-size-param in preg_match_all() with \C + UTF-8 multibyte input | ||
| --CREDITS-- | ||
| vi3tL0u1s | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| $r = preg_match_all("/(.*)\\C/u", "à", $m); | ||
| var_dump($r, $m); | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| Warning: preg_match_all(): Compilation failed: using \C is incompatible with the 'u' modifier at offset 6 in %s on line %d | ||
| bool(false) | ||
| NULL |
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would need to document it somehow (UPGRADING ?) wdyt ?