From 7f78f839dc476b064b1ecdda5d69389673319c2a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 3 Sep 2019 09:25:50 +0200 Subject: [PATCH] php_stream_from_zval can no longer return false --- ext/opcache/Optimizer/zend_func_info.c | 2 +- main/php_streams.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index cd9a457e71..be990ec8fb 100644 --- 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 11e7c2aae7..b85b6b3c38 100644 --- 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()) -- 2.40.0