Repository navigation
Add stack-limit guards to var_export(), print_r() and unserialize() #25014
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
Volkopat
wants to merge
2
commits into
php:master
Choose a base branch
from
Volkopat:fix/stack-limit-var-export-print-r
base: master
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.
+60
−0
Open
Changes from all commits
Commits
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 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
42 changes: 42 additions & 0 deletions
42
ext/standard/tests/general_functions/gh24605_stack_guard.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,42 @@ | ||
| --TEST-- | ||
| GH-24605 (var_export(), print_r() and unserialize() segfault on deep nesting) | ||
| --SKIPIF-- | ||
| <?php | ||
| if (ini_get('zend.max_allowed_stack_size') === false) { | ||
| die('skip No stack limit support'); | ||
| } | ||
| if (getenv('SKIP_ASAN')) { | ||
| die('skip ASAN needs different stack limit setting due to more stack space usage'); | ||
| } | ||
| ?> | ||
| --INI-- | ||
| zend.max_allowed_stack_size=512K | ||
| --FILE-- | ||
| <?php | ||
| $a = 0; | ||
| for ($i = 0; $i < 3000; $i++) { | ||
| $a = [$a]; | ||
| } | ||
| $u = str_repeat('a:1:{i:0;', 3000) . 'i:0;' . str_repeat('}', 3000); | ||
|
|
||
| $calls = [ | ||
| 'var_export' => static fn() => var_export($a), | ||
| 'print_r' => static fn() => print_r($a, true), | ||
| 'unserialize' => static fn() => unserialize($u), | ||
| ]; | ||
|
|
||
| foreach ($calls as $name => $call) { | ||
| try { | ||
| $call(); | ||
| echo $name, ": no error\n"; | ||
| } catch (\Error $e) { | ||
| echo $name, ': ', | ||
| str_contains($e->getMessage(), 'Maximum call stack size') ? 'stack error' : 'other error', | ||
| "\n"; | ||
| } | ||
| } | ||
| ?> | ||
| --EXPECT-- | ||
| var_export: stack error | ||
| print_r: stack error | ||
| unserialize: stack error |
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 |
|---|---|---|
|
|
@@ -538,6 +538,12 @@ static zend_result php_object_element_export(zval *zv, zend_ulong index, zend_st | |
|
|
||
| PHPAPI zend_result php_var_export_ex(zval *struc, int level, smart_str *buf) /* {{{ */ | ||
| { | ||
| #ifdef ZEND_CHECK_STACK_LIMIT | ||
| if (UNEXPECTED(zend_call_stack_overflowed(EG(stack_limit)))) { | ||
| zend_call_stack_size_error(); | ||
| return FAILURE; | ||
| } | ||
| #endif | ||
|
Comment on lines
+541
to
+546
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. This is already handled by #24671 so it should be dropped. |
||
| HashTable *myht; | ||
| zend_string *ztmp, *ztmp2; | ||
| zend_ulong index; | ||
|
|
||
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
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.
This does not propagate errors so there should be some exception check.