diff options
| author | Stanislav Malyshev <stas@php.net> | 2017-01-15 17:33:48 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2017-01-15 17:33:48 -0800 |
| commit | 540e6728683b19ab9b1336650af06b3100422f02 (patch) | |
| tree | 295ad937315c12f0825546857f9756216feb858d /ext | |
| parent | cd2b462a2742c79256668d4736644e34573c33d9 (diff) | |
| parent | 19e80ef4963d7371ee25b85f8224ee912efe418e (diff) | |
| download | php-git-540e6728683b19ab9b1336650af06b3100422f02.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Update more functions with path check
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/curl/curl_file.c | 2 | ||||
| -rw-r--r-- | ext/zip/php_zip.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c index c18f365668..92378a6c6d 100644 --- 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 index 9114eb4d76..fa79ffb352 100644 --- 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; } |