Catch potential exceptions during to string conversion #6042
Conversation
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
As of PHP 7.4.0, exceptions are allowed to be thrown from inside `__toString()` methods; we have to cater to that, and catch these exceptions early.
cmb69
force-pushed
the
cmb/com-tostring-ex
branch
from
3d177e3 to
b67f4d5
Compare
Girgias
reviewed
Aug 26, 2020
| @@ -720,7 +728,9 @@ PHP_FUNCTION(com_event_sink) | |||
| if ((tmp = zend_hash_index_find(Z_ARRVAL_P(sink), 1)) != NULL && Z_TYPE_P(tmp) == IS_STRING) | |||
| dispname = Z_STRVAL_P(tmp); | |||
| } else if (sink != NULL) { | |||
| convert_to_string(sink); | |||
| if (!try_convert_to_string(sink)) { | |||
| return; | |||
There was a problem hiding this comment.
As these are in a PHP_FUNCTION you could use RETURN_THROWS()
There was a problem hiding this comment.
Ah, yes, thanks! I'll do so when merging into master (PR targets PHP 7.4).
There was a problem hiding this comment.
Right I didn't see the target :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As of PHP 7.4.0, exceptions are allowed to be thrown from inside
__toString()methods; we have to cater to that, and catch theseexceptions early.