Fix RegexIterator::USE_KEY related bug#2133
Closed
marcioAlmada wants to merge 1 commit intophp:masterfrom
Closed
Conversation
Closed
Contributor
Author
|
This behavior is oscillating between minor versions too:
|
nikic
reviewed
Sep 19, 2016
ext/spl/spl_iterators.c
Outdated
| if (Z_TYPE(intern->current.data) == IS_UNDEF) { | ||
| RETURN_FALSE; | ||
| } else if (Z_TYPE(intern->current.data) == IS_ARRAY) { | ||
| } else if (intern->u.regex.flags ^ REGIT_USE_KEY && Z_TYPE(intern->current.data) == IS_ARRAY) { |
Member
There was a problem hiding this comment.
This should be (intern->u.regex.flags & REGIT_USE_KEY). Alternatively the IS_ARRAY check can be moved into the branch in L2048.
Contributor
Author
There was a problem hiding this comment.
E_RUSH :) ended up moving the array check, it's simpler to read. Thanks.
In case USE_KEY flag is active, RegexIterator->accept() should keep it's old behavior which is to accept keys mapping arrays. This broke after PHP 5.5 but was not noticed due to lack of tests for USE_KEY.
marcioAlmada
force-pushed
the
bug/regex-iterator-USE_KEY
branch
from
8147f3b to
a050565
Compare
Member
|
Merged via 4397306, thanks! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This is related to #865. Turns out in case
USE_KEYflag is active RegexIterator->accept() should keep it's old behavior which is to accept keys mapping arrays:https://3v4l.org/EmbIN
This broke after PHP 5.5 but was not noticed due to lack of tests for
USE_KEYor maybe it was considered undefined behavior. Anyway, it seems that the new behavior is not as reasonable as what we had on v5.4?Thoughts?