-
Notifications
You must be signed in to change notification settings - Fork 7.8k
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
Fix GH-17187: unreachable program point in zend_hash #17205
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| --TEST-- | ||
| GH-17187 (unreachable program point in zend_hash) | ||
| --EXTENSIONS-- | ||
| xml | ||
| --CREDITS-- | ||
| chongwick | ||
| --FILE-- | ||
| <?php | ||
| class ImmutableParser { | ||
| private $parser; | ||
| private $immutableData; | ||
| private $arrayCopy; | ||
|
|
||
| public function __construct() { | ||
| $this->parser = xml_parser_create(); | ||
| xml_set_element_handler($this->parser, function ($parser, $name, $attrs) { | ||
| echo "open\n"; | ||
| var_dump($name, $attrs); | ||
| $this->arrayCopy = [$this]; // Create cycle intentionally | ||
| $this->immutableData = $this->arrayCopy; | ||
| }, function ($parser, $name) { | ||
| echo "close\n"; | ||
| var_dump($name); | ||
| }); | ||
| } | ||
|
|
||
| public function parseXml($xml) { | ||
| $this->immutableData = array(); | ||
| xml_parse_into_struct($this->parser, $xml, $this->immutableData, $this->immutableData); | ||
| return $this->immutableData; | ||
| } | ||
| } | ||
| $immutableParser = new ImmutableParser(); | ||
| $xml = "<container><child/></container>"; | ||
| $immutableData = $immutableParser->parseXml($xml); | ||
| var_dump($immutableData); | ||
| ?> | ||
| --EXPECT-- | ||
| open | ||
| string(9) "CONTAINER" | ||
| array(0) { | ||
| } | ||
| open | ||
| string(5) "CHILD" | ||
| array(0) { | ||
| } | ||
| close | ||
| string(5) "CHILD" | ||
| close | ||
| string(9) "CONTAINER" | ||
| array(5) { | ||
| [0]=> | ||
| object(ImmutableParser)#1 (3) { | ||
| ["parser":"ImmutableParser":private]=> | ||
| object(XMLParser)#2 (0) { | ||
| } | ||
| ["immutableData":"ImmutableParser":private]=> | ||
| *RECURSION* | ||
| ["arrayCopy":"ImmutableParser":private]=> | ||
| array(1) { | ||
| [0]=> | ||
| *RECURSION* | ||
| } | ||
| } | ||
| ["CHILD"]=> | ||
| array(1) { | ||
| [0]=> | ||
| int(1) | ||
| } | ||
| [1]=> | ||
| array(3) { | ||
| ["tag"]=> | ||
| string(5) "CHILD" | ||
| ["type"]=> | ||
| string(8) "complete" | ||
| ["level"]=> | ||
| int(2) | ||
| } | ||
| ["CONTAINER"]=> | ||
| array(1) { | ||
| [0]=> | ||
| int(2) | ||
| } | ||
| [2]=> | ||
| array(3) { | ||
| ["tag"]=> | ||
| string(9) "CONTAINER" | ||
| ["type"]=> | ||
| string(5) "close" | ||
| ["level"]=> | ||
| int(1) | ||
| } | ||
| } |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| --TEST-- | ||
| GH-17187 (unreachable program point in zend_hash) | ||
| --EXTENSIONS-- | ||
| xml | ||
| --CREDITS-- | ||
| chongwick | ||
| --FILE-- | ||
| <?php | ||
| class ImmutableParser { | ||
| public $parser; | ||
| public $immutableData1; | ||
| public $immutableData2; | ||
|
|
||
| public function __construct() { | ||
| $this->parser = xml_parser_create(); | ||
| xml_set_element_handler($this->parser, function ($parser, $name, $attrs) { | ||
| echo "open\n"; | ||
| var_dump($name, $attrs); | ||
| $this->immutableData1 = 0xdead; | ||
| $this->immutableData2 = 0xbeef; | ||
| }, function ($parser, $name) { | ||
| echo "close\n"; | ||
| var_dump($name); | ||
| }); | ||
| } | ||
|
|
||
| public function parseXml($xml) { | ||
| $this->immutableData1 = array(); | ||
| $this->immutableData2 = array(); | ||
| xml_parse_into_struct($this->parser, $xml, $this->immutableData1, $this->immutableData2); | ||
| } | ||
| } | ||
| $immutableParser = new ImmutableParser(); | ||
| $xml = "<container><child/></container>"; | ||
| $immutableParser->parseXml($xml); | ||
| var_dump($immutableParser->immutableData1); | ||
| var_dump($immutableParser->immutableData2); | ||
| ?> | ||
| --EXPECT-- | ||
| open | ||
| string(9) "CONTAINER" | ||
| array(0) { | ||
| } | ||
| open | ||
| string(5) "CHILD" | ||
| array(0) { | ||
| } | ||
| close | ||
| string(5) "CHILD" | ||
| close | ||
| string(9) "CONTAINER" | ||
| int(57005) | ||
| int(48879) |
This file contains 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
Oops, something went wrong.
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.
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.
not entirely certain about these two changes, is it a cleanup thing you re doing here ?
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.
It's not cleanup, we need the original value of xdata.
xdata is now a reference, but if the return value of
zend_try_array_initwere used then it would be the array that xdata references to. We need to hold on to the reference, we can't hold on to the array because that would break the RC1 constraint of the array and would also make it impossible to separate it.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.
ah ok makes a lot more sense.