diff options
| author | Stanislav Malyshev <stas@php.net> | 2017-01-15 17:32:37 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2017-01-15 17:32:37 -0800 |
| commit | 19e80ef4963d7371ee25b85f8224ee912efe418e (patch) | |
| tree | 964b0a5af6e0932571e44739cc41920829abba39 | |
| parent | bd0569e287b633a3284479b55ff74501529039ab (diff) | |
| parent | 43d0f2abc552781847a23fe9b2d89925c6201078 (diff) | |
| download | php-git-19e80ef4963d7371ee25b85f8224ee912efe418e.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update more functions with path check
| -rw-r--r-- | ext/curl/curl_file.c | 2 | ||||
| -rw-r--r-- | ext/exif/exif.c | 2 | ||||
| -rw-r--r-- | ext/zip/php_zip.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c index 0fcf41acec..7a047feb7f 100644 --- a/ext/curl/curl_file.c +++ b/ext/curl/curl_file.c @@ -35,7 +35,7 @@ static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS) size_t fname_len, mime_len, postname_len; zval *cf = return_value; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ss", &fname, &fname_len, &mime, &mime_len, &postname, &postname_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|ss", &fname, &fname_len, &mime, &mime_len, &postname, &postname_len) == FAILURE) { return; } diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 06e2aae39c..4525fb3553 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -4204,7 +4204,7 @@ PHP_FUNCTION(exif_imagetype) php_stream * stream; int itype = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &imagefile, &imagefile_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &imagefile, &imagefile_len) == FAILURE) { return; } diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index bfa473f002..bd6684c26f 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; } |