com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/curl/curl _file.c ext/exif/exif.c ext/zip/php_zip.c

From: Date: Mon, 16 Jan 2017 01:32:26 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/curl/curl _file.c ext/exif/exif.c ext/zip/php_zip.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-96740@lists.php.net to get a copy of this message
Commit: 43d0f2abc552781847a23fe9b2d89925c6201078 Author: Stanislav Malyshev <stas@php.net> Sun, 15 Jan 2017 17:32:26 -0800 Parents: 4f19bb7af61fb05f369b0bc48a962eae5ab23320 0ab1af7d3eff815e1809fe044e54283b5a1b8e27 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43d0f2abc552781847a23fe9b2d89925c6201078 Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Update more functions with path check Changed paths: MM ext/curl/curl_file.c MM ext/exif/exif.c MM ext/zip/php_zip.c Diff: diff --cc ext/curl/curl_file.c index 0fcf41a,9792492..7a047fe --- a/ext/curl/curl_file.c +++ b/ext/curl/curl_file.c @@@ -32,10 -32,10 +32,10 @@@ PHP_CURL_API zend_class_entry *curl_CUR static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS) { char *fname = NULL, *mime = NULL, *postname = NULL; - int fname_len, mime_len, postname_len; + 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() TSRMLS_CC, "p|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 --cc ext/exif/exif.c index ca01907,1c8772f..5de48bd --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@@ -4203,7 -4210,7 +4203,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() TSRMLS_CC, "p", &imagefile, &imagefile_len) == FAILURE) { ++ if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &imagefile, &imagefile_len) == FAILURE) { return; } diff --cc ext/zip/php_zip.c index 20c4e86,52f058c..e741226 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@@ -2617,7 -2662,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() TSRMLS_CC, "p|z", &pathto, &pathto_len, &zval_files) == FAILURE) { ++ if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|z", &pathto, &pathto_len, &zval_files) == FAILURE) { return; }

« previous php.cvs (#96740) next »