Skip to content

Zend guard recursion protection #11812

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.

Sign up for GitHub

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

Closed
wants to merge 8 commits into from
Closed

Zend guard recursion protection #11812

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f32410b
Extend zend guards to allow recursion protection
bukka May 23, 2023
9044e86
Extend and integrate zend guard recursion protection to json
bukka Jun 19, 2023
91bd5b8
Use zend guard for debug printing if possible
bukka Jun 20, 2023
c5a046d
Fix zend guard property initialization
bukka Jul 23, 2023
4aa2e05
Add json encode recursion tests
bukka Jul 23, 2023
960ed2e
Fix some json recursion test to not expect delayed check
bukka Jul 28, 2023
91f8979
Introduce a new guard recursion type for var_export
bukka Jul 28, 2023
fc718a8
Fix some minor types and missing parens
bukka Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix some json recursion test to not expect delayed check
  • Loading branch information
@bukka
bukka committed Aug 24, 2023
commit 960ed2eddc8cdb337eef1b6a8b818b77a6ca7b86
1 change: 0 additions & 1 deletion ext/json/tests/json_encode_recursion_01.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ var_dump(json_encode(new SerializingTest()));
--EXPECT--
bool(false)
string(7) "{"a":1}"
string(7) "{"a":1}"
3 changes: 1 addition & 2 deletions ext/json/tests/json_encode_recursion_03.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ var_dump(new SerializingTest());

?>
--EXPECT--
*RECURSION*
object(SerializingTest)#1 (1) {
["result"]=>
string(7) "{"a":1}"
bool(false)
}
string(7) "{"a":1}"
---------
Expand Down
2 changes: 1 addition & 1 deletion ext/json/tests/json_encode_recursion_06.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ var_dump(serialize(new SerializeFirstTest()));
?>
--EXPECT--
string(68) "{"serialize":"O:19:\"JsonEncodeFirstTest\":1:{s:6:\"result\";i:1;}"}"
string(194) "O:18:"SerializeFirstTest":1:{s:6:"result";s:142:"{"json":"O:18:\"SerializeFirstTest\":1:{s:6:\"result\";s:62:\"{\"json\":\"O:18:\\\"SerializeFirstTest\\\":1:{s:6:\\\"result\\\";b:0;}\"}\";}"}";}"
string(113) "O:18:"SerializeFirstTest":1:{s:6:"result";s:62:"{"json":"O:18:\"SerializeFirstTest\":1:{s:6:\"result\";b:0;}"}";}"