Skip to content

Commit 43d0f2a

Browse files
committed
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Update more functions with path check
2 parents 4f19bb7 + 0ab1af7 commit 43d0f2a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ext/curl/curl_file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS)
3535
size_t fname_len, mime_len, postname_len;
3636
zval *cf = return_value;
3737

38-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ss", &fname, &fname_len, &mime, &mime_len, &postname, &postname_len) == FAILURE) {
38+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|ss", &fname, &fname_len, &mime, &mime_len, &postname, &postname_len) == FAILURE) {
3939
return;
4040
}
4141

ext/exif/exif.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4203,7 +4203,7 @@ PHP_FUNCTION(exif_imagetype)
42034203
php_stream * stream;
42044204
int itype = 0;
42054205

4206-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &imagefile, &imagefile_len) == FAILURE) {
4206+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &imagefile, &imagefile_len) == FAILURE) {
42074207
return;
42084208
}
42094209

ext/zip/php_zip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2617,7 +2617,7 @@ static ZIPARCHIVE_METHOD(extractTo)
26172617
RETURN_FALSE;
26182618
}
26192619

2620-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|z", &pathto, &pathto_len, &zval_files) == FAILURE) {
2620+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|z", &pathto, &pathto_len, &zval_files) == FAILURE) {
26212621
return;
26222622
}
26232623

0 commit comments

Comments
 (0)