Fix GH-12457: Fixed a bug in zend_memnistr #12458
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
e28e414 to
0e1ab41
Compare
|
@iluuu1994 |
0b168a9 to
9aebcd9
Compare
add test phpGH-12457 add test pattern phpGH-12457 Fix order of elvis of zend_memnistr add more test cases for Fix phpGH-12457 Fixed test expectations for phpGH-12457
9aebcd9 to
401b744
Compare
iluuu1994
approved these changes
Oct 18, 2023
| @@ -945,7 +945,7 @@ zend_memnistr(const char *haystack, const char *needle, size_t needle_len, const | |||
| const char *p_upper = NULL; | |||
| if (first_lower != first_upper) { | |||
| // If the needle length is 1 we don't need to look beyond p_lower as it is a guaranteed match | |||
| size_t upper_search_length = end - (needle_len == 1 && p_lower != NULL ? p_lower : haystack); | |||
| size_t upper_search_length = needle_len == 1 && p_lower != NULL ? p_lower - haystack : end - haystack; | |||
There was a problem hiding this comment.
Indeed, the original code was meant to be this:
size_t upper_search_length = (needle_len == 1 && p_lower != NULL ? p_lower : end) - haystack;But your version may be more readable.
|
Thank you for merge! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #12457
(edit) Thanks for the review request, Tim.