Skip to content

Commit 7f78f83

Browse files
committed
php_stream_from_zval can no longer return false
1 parent 3ac0f42 commit 7f78f83

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/opcache/Optimizer/zend_func_info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ static const func_info_t func_infos[] = {
10681068
F1("hash_hmac_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
10691069
F1("hash_init", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
10701070
F0("hash_update", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
1071-
F0("hash_update_stream", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
1071+
F0("hash_update_stream", MAY_BE_NULL | MAY_BE_LONG),
10721072
F0("hash_update_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
10731073
F1("hash_final", MAY_BE_NULL | MAY_BE_STRING),
10741074
F1("hash_copy", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),

main/php_streams.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,13 @@ END_EXTERN_C()
260260
#define php_stream_from_zval(xstr, pzval) do { \
261261
if (((xstr) = (php_stream*)zend_fetch_resource2_ex((pzval), \
262262
"stream", php_file_le_stream(), php_file_le_pstream())) == NULL) { \
263-
RETURN_FALSE; \
263+
return; \
264264
} \
265265
} while (0)
266266
#define php_stream_from_res(xstr, res) do { \
267267
if (((xstr) = (php_stream*)zend_fetch_resource2((res), \
268268
"stream", php_file_le_stream(), php_file_le_pstream())) == NULL) { \
269-
RETURN_FALSE; \
269+
return; \
270270
} \
271271
} while (0)
272272
#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())

0 commit comments

Comments
 (0)