Fix bug #69207 - move_uploaded_file allows nulls in path

diff --git a/NEWS b/NEWS
index b8dad754f5464068b0aa3f515e739fb2d0275800..9b45a99b0f1de19ec4837f7884c6f240f78ea0b2 100644 (file)
--- 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 9a9df3094bec559376bacfbb9e6737c28f91dfda..c3e223048afaa30e087036e006adb0849babcccc 100644 (file)
--- 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;
        }