Add MAY_BE_NULL back to opcache info for stream_bucket_make_writeable #4567
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
This reverts one change in 001d434 An example of the function returning null in practice can be seen in TysonAndre/php-src-ast-analysis#4 - This repo also has some types that were missing from zend_func_info in the examples file (e.g. spl_object_hash, spl_object_id), that may be of interest. The implementation of stream_bucket_make_writeable sets the return value to null if the head of the bucket no longer exists. ```c if ((brigade = (php_stream_bucket_brigade*)zend_fetch_resource( Z_RES_P(zbrigade), PHP_STREAM_BRIGADE_RES_NAME, le_bucket_brigade)) == NULL) { RETURN_FALSE; } ZVAL_NULL(return_value); if (brigade->head && (bucket = php_stream_bucket_make_writeable(brigade->head))) { ```
nikic
reviewed
Aug 20, 2019
| @@ -732,7 +732,7 @@ static const func_info_t func_infos[] = { | |||
| F1("str_rot13", MAY_BE_STRING), | |||
| F1("stream_get_filters", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), | |||
| F0("stream_filter_register", MAY_BE_FALSE | MAY_BE_TRUE), | |||
| F1("stream_bucket_make_writeable", MAY_BE_FALSE | MAY_BE_OBJECT), | |||
| F1("stream_bucket_make_writeable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT), | |||
There was a problem hiding this comment.
While at it, the false type can be removed instead.
There was a problem hiding this comment.
I assume that the return value is unused because zend_fetch_resource throws an exception by calling zend_type_error.
- Are there any circumstances in the interpreter where calling RETURN_FALSE has a side effect even if an Error or Exception is thrown?
if ((brigade = (php_stream_bucket_brigade*)zend_fetch_resource(
Z_RES_P(zbrigade), PHP_STREAM_BRIGADE_RES_NAME, le_bucket_brigade)) == NULL) {
RETURN_FALSE;
}
The RETURN_NULL was added for clarity. zend_fetch_resource always calls zend_type_error if it returned NULL.
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 reverts one change in 001d434
A php snippet causing the function returning null in practice can be seen in
TysonAndre/php-src-ast-analysis#4
the examples file (e.g. spl_object_hash, spl_object_id), that may be
of interest - some entries are inaccurate and have extra/missing types. No other obvious bugs were seen.
The implementation of stream_bucket_make_writeable sets the return value
to null if the head of the bucket no longer exists.
Alternatively, change the ZVAL_NULL macro to something setting the return value to false in the implementation. (I don't use this functionality)