php_stream_from_zval can no longer return false

diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c
index cd9a457e7199265019503567bc3538d9335eaa7e..be990ec8fbd7d2694ab1bb9e4ee1a4cb03f9792c 100644 (file)
--- a/ext/opcache/Optimizer/zend_func_info.c
+++ b/ext/opcache/Optimizer/zend_func_info.c
@@ -1068,7 +1068,7 @@ static const func_info_t func_infos[] = {
        F1("hash_hmac_file",                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
        F1("hash_init",                             MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
        F0("hash_update",                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("hash_update_stream",                    MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
+       F0("hash_update_stream",                    MAY_BE_NULL | MAY_BE_LONG),
        F0("hash_update_file",                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
        F1("hash_final",                            MAY_BE_NULL | MAY_BE_STRING),
        F1("hash_copy",                             MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),

diff --git a/main/php_streams.h b/main/php_streams.h
index 11e7c2aae7c50a7a4a33f00d4a25effe261b682f..b85b6b3c382ef47d30b5061c73496c53a16078f6 100644 (file)
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -260,13 +260,13 @@ END_EXTERN_C()
 #define php_stream_from_zval(xstr, pzval)      do { \
        if (((xstr) = (php_stream*)zend_fetch_resource2_ex((pzval), \
                                "stream", php_file_le_stream(), php_file_le_pstream())) == NULL) { \
-               RETURN_FALSE; \
+               return; \
        } \
 } while (0)
 #define php_stream_from_res(xstr, res) do { \
        if (((xstr) = (php_stream*)zend_fetch_resource2((res), \
                                "stream", php_file_le_stream(), php_file_le_pstream())) == NULL) { \
-               RETURN_FALSE; \
+               return; \
        } \
 } while (0)
 #define php_stream_from_res_no_verify(xstr, pzval)     (xstr) = (php_stream*)zend_fetch_resource2((res), "stream", php_file_le_stream(), php_file_le_pstream())