-
Notifications
You must be signed in to change notification settings - Fork 8k
Fix shm corruption with coercion in options of unserialize() #20129
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
Open
nielsdos
wants to merge
2
commits into
php:PHP-8.3
Choose a base branch
from
nielsdos:fix-shm-unserialize-options
base: PHP-8.3
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+13
−4
Open
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
8 changes: 8 additions & 0 deletions
8
ext/standard/tests/serialize/shm_corruption_coercion_unserialize_options.phpt
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
--TEST-- | ||
Shm corruption with coercion in options of unserialize() | ||
--FILE-- | ||
<?php | ||
unserialize("{}", ["allowed_classes" => [0]]); | ||
?> | ||
--EXPECTF-- | ||
Warning: unserialize(): Error at offset 0 of 2 bytes in %s on line %d |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1366,13 +1366,14 @@ PHPAPI void php_unserialize_with_options(zval *return_value, const char *buf, co | |
} | ||
if(class_hash && Z_TYPE_P(classes) == IS_ARRAY) { | ||
zval *entry; | ||
zend_string *lcname; | ||
|
||
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(classes), entry) { | ||
convert_to_string(entry); | ||
lcname = zend_string_tolower(Z_STR_P(entry)); | ||
/* Note: cannot use zval_get_tmp_string() here as we need to keep it in class_hash for longer than this loop. */ | ||
zend_string *str = zval_get_string(entry); | ||
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. Any reason for not using the 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. Possible, but not necessary, as we will exit at the exception check a bit later. |
||
zend_string *lcname = zend_string_tolower(str); | ||
zend_hash_add_empty_element(class_hash, lcname); | ||
zend_string_release_ex(lcname, 0); | ||
zend_string_release_ex(lcname, false); | ||
zend_string_release_ex(str, false); | ||
} ZEND_HASH_FOREACH_END(); | ||
|
||
/* Exception during string conversion. */ | ||
|
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.
What happens if you have a non-stringable object as an option?
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.
That will work
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.
In the sense that it will throw and exit out at the check after the loop
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.
Cool that's the thing I was wondering about.