ZPP changes evaluation tool #1110
Closed
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
| #if STH_DISABLE_NULL_TO_STRING | ||
| } else { | ||
| return 0; | ||
| #endif |
There was a problem hiding this comment.
you need an else here to prevent a segfault (null pointer). I added a goto to the conversion logic in an else branch and it worked fine:
@@ -1241,6 +1241,9 @@ static zend_always_inline int zend_parse_arg_str(zval *arg, zend_string **dest,
#if STH_DISABLE_NULL_TO_STRING
} else {
return 0;
+#else
+ } else {
+ goto convert;
#endif
}
#if STH_DISABLE_BOOL_TO_STRING
@@ -1248,6 +1251,7 @@ static zend_always_inline int zend_parse_arg_str(zval *arg, zend_string **dest,
return 0;
#endif
} else {
+convert:
if (Z_COPYABLE_P(arg) && Z_REFCOUNT_P(arg) > 1) {
There was a problem hiding this comment.
It seems I fixed it almost the same way before I saw your comment. Fixed another small bug. Hope it's cleaner now. Thanks.
| return 0; | ||
| #endif | ||
| #if STH_DISABLE_STRING_TO_BOOL | ||
| } else if (Z_TYPE_P(arg) == IS_DOUBLE) { |
|
Closing as the corresponding RFC was rejected. |
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.
This PR allows to test several potential changes in the ZPP ruleset, which is used when parsing internal function input arguments and will be potentially used for scalar type hinting.
Potential changes can be activated one by one or in any combination. Configuration is done by setting/unsetting values in Zend/zend_tmp_sth.h before compilation.
Please run configure with the '--disable-phar' option when testing this, as building phar.phar breaks when 'null to string' conversion is disabled (this is caused by a bug in phar code, and I don't have time to fix it).
The set of available flags will be extended when needed to propose additional restrictions or changes in behavior.
This conditional stuff is temporary and exists only as an addtional help for testing potential BC breaks before a final ruleset is voted upon. It will in no way be kept in the future released code.