summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-03-17 12:47:58 -0700
committerStanislav Malyshev <stas@php.net>2015-03-17 12:47:58 -0700
commit1291d6bbee93b6109eb07e8f7916ff1b7fcc13e1 (patch)
treec30a5def28d1ce6576e6d0327d5deddcccb15ab6
parentc8eaca013a3922e8383def6158ece2b63f6ec483 (diff)
downloadphp-git-1291d6bbee93b6109eb07e8f7916ff1b7fcc13e1.tar.gz
Fix bug #69207 - move_uploaded_file allows nulls in path
-rw-r--r--NEWS3
-rw-r--r--ext/standard/basic_functions.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b8dad754f5..9b45a99b0f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2015 PHP 5.4.39
+- Core:
+ . Fixed bug #69207 (move_uploaded_file allows nulls in path). (Stas)
+
19 Feb 2015 PHP 5.4.38
- Core:
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 9a9df3094b..c3e223048a 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -5775,7 +5775,7 @@ PHP_FUNCTION(move_uploaded_file)
RETURN_FALSE;
}
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &path, &path_len, &new_path, &new_path_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sp", &path, &path_len, &new_path, &new_path_len) == FAILURE) {
return;
}