Merge branch 'PHP-7.1'

smalyshev · smalyshev · commit 540e6728683b · 2017-01-15T17:33:48.000-08:00
* PHP-7.1:
  Update more functions with path check
diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c
@@ -35,7 +35,7 @@ static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS)
 	zval *cf = return_value;
 
 	ZEND_PARSE_PARAMETERS_START(1,3)
-		Z_PARAM_STR(fname)
+		Z_PARAM_PATH_STR(fname)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(mime)
 		Z_PARAM_STR(postname)
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -2617,7 +2617,7 @@ static ZIPARCHIVE_METHOD(extractTo)
 		RETURN_FALSE;
 	}
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|z", &pathto, &pathto_len, &zval_files) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|z", &pathto, &pathto_len, &zval_files) == FAILURE) {
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2617,7 +2617,7 @@ static ZIPARCHIVE_METHOD(extractTo)`
`2617`	`2617`	`RETURN_FALSE;`
`2618`	`2618`	`}`
`2619`	`2619`
`2620`		`- if (zend_parse_parameters(ZEND_NUM_ARGS(), "s\|z", &pathto, &pathto_len, &zval_files) == FAILURE) {`
	`2620`	`+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "p\|z", &pathto, &pathto_len, &zval_files) == FAILURE) {`
`2621`	`2621`	`return;`
`2622`	`2622`	`}`
`2623`	`2623`