From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 14 Oct 2020 14:57:38 +0000 (+0200)
Subject: Sync zpp in phar interceptors
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e065d97e9463f548d66b3292bd1dfccc29228061;p=php

Sync zpp in phar interceptors

This should match the zpp of the intercepted functions...
---

diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
index f7cfe2249f..9987f79572 100644
--- a/ext/phar/func_interceptors.c
+++ b/ext/phar/func_interceptors.c
@@ -36,7 +36,7 @@ PHAR_FUNC(phar_opendir) /* {{{ */
 		goto skip_phar;
 	}
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|z", &filename, &filename_len, &zcontext) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|r!", &filename, &filename_len, &zcontext) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -347,7 +347,7 @@ PHAR_FUNC(phar_fopen) /* {{{ */
 		/* no need to check, include_path not even specified in fopen/ no active phars */
 		goto skip_phar;
 	}
-	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) {
+	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) {
 		goto skip_phar;
 	}
 	if (use_include_path || (!IS_ABSOLUTE_PATH(filename, filename_len) && !strstr(filename, "://"))) {