com php-src: Update more functions with path check: ext/curl/curl_file.c ext/exif/exif.c ext/zip/php_zi p.c
| From: | Stanislav Malyshev | Date: | Mon, 16 Jan 2017 01:31:08 +0000 |
| Subject: | com php-src: Update more functions with path check: ext/curl/curl_file.c ext/exif/exif.c ext/zip/php_zi p.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96739@lists.php.net to get a copy of this message | ||
Commit: 0ab1af7d3eff815e1809fe044e54283b5a1b8e27
Author: Stanislav Malyshev <stas@php.net> Sun, 15 Jan 2017 17:31:08 -0800
Parents: ad9c552b120b8f73a5e87b2f8af05e32db512e9f
Branches: PHP-5.6 PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0ab1af7d3eff815e1809fe044e54283b5a1b8e27
Log:
Update more functions with path check
Changed paths:
M ext/curl/curl_file.c
M ext/exif/exif.c
M ext/zip/php_zip.c
Diff:
diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c
index 029a58a..9792492 100644
--- a/ext/curl/curl_file.c
+++ b/ext/curl/curl_file.c
@@ -35,7 +35,7 @@ static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS)
int fname_len, mime_len, postname_len;
zval *cf = return_value;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ss", &fname, &fname_len,
&mime, &mime_len, &postname, &postname_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "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 3663b3f..1c8772f 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -4210,7 +4210,7 @@ PHP_FUNCTION(exif_imagetype)
php_stream * stream;
int itype = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &imagefile,
&imagefile_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &imagefile,
&imagefile_len) == FAILURE) {
return;
}
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 9f2b376..52f058c 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -2662,7 +2662,7 @@ static ZIPARCHIVE_METHOD(extractTo)
RETURN_FALSE;
}
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z", &pathto,
&pathto_len, &zval_files) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|z", &pathto,
&pathto_len, &zval_files) == FAILURE) {
return;
}