]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 01:33:48 +0000 (17:33 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 01:33:48 +0000 (17:33 -0800)
* PHP-7.1:
  Update more functions with path check

1  2 
ext/curl/curl_file.c
ext/zip/php_zip.c

index c18f36566859bb747925771cabc0895407f8c009,7a047feb7f97e892014858a690b2291bde2b22bf..92378a6c6d2c42db49bf107885a5a2e5ffc6960b
@@@ -31,20 -31,20 +31,20 @@@ PHP_CURL_API zend_class_entry *curl_CUR
  
  static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS)
  {
 -      char *fname = NULL, *mime = NULL, *postname = NULL;
 -      size_t fname_len, mime_len, postname_len;
 +      zend_string *fname, *mime = NULL, *postname = NULL;
        zval *cf = return_value;
  
 -      if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|ss", &fname, &fname_len, &mime, &mime_len, &postname, &postname_len) == FAILURE) {
 -              return;
 -      }
 +      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)
 +      ZEND_PARSE_PARAMETERS_END();
  
 -      if (fname) {
 -              zend_update_property_string(curl_CURLFile_class, cf, "name", sizeof("name")-1, fname);
 -      }
 +      zend_update_property_string(curl_CURLFile_class, cf, "name", sizeof("name")-1, ZSTR_VAL(fname));
  
        if (mime) {
 -              zend_update_property_string(curl_CURLFile_class, cf, "mime", sizeof("mime")-1, mime);
 +              zend_update_property_string(curl_CURLFile_class, cf, "mime", sizeof("mime")-1, ZSTR_VAL(mime));
        }
  
        if (postname) {
Simple merge