Skip to content

Commit e6e9f64

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Sync zpp in phar interceptors
2 parents a16699e + e065d97 commit e6e9f64

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/phar/func_interceptors.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ PHAR_FUNC(phar_opendir) /* {{{ */
3636
goto skip_phar;
3737
}
3838

39-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|z", &filename, &filename_len, &zcontext) == FAILURE) {
39+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|r!", &filename, &filename_len, &zcontext) == FAILURE) {
4040
RETURN_THROWS();
4141
}
4242

@@ -347,7 +347,7 @@ PHAR_FUNC(phar_fopen) /* {{{ */
347347
/* no need to check, include_path not even specified in fopen/ no active phars */
348348
goto skip_phar;
349349
}
350-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "ps|br", &filename, &filename_len, &mode, &mode_len, &use_include_path, &zcontext) == FAILURE) {
350+
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "ps|br!", &filename, &filename_len, &mode, &mode_len, &use_include_path, &zcontext) == FAILURE) {
351351
goto skip_phar;
352352
}
353353
if (use_include_path || (!IS_ABSOLUTE_PATH(filename, filename_len) && !strstr(filename, "://"))) {

0 commit comments

Comments
 (0)