diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-17 12:58:00 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-17 12:58:00 -0700 |
| commit | 3477568b4e95b90c3cfd329a0fe7fc97d2b66d74 (patch) | |
| tree | 0000f900cb735e7b651bb1dac10125c27ff36a8a /ext/standard/basic_functions.c | |
| parent | f040b483589e3d98cf5dec8cd51dda6bb2a4e513 (diff) | |
| parent | 34418222d784f0b3666649fb9afb05ffcf5cedb7 (diff) | |
| download | php-git-3477568b4e95b90c3cfd329a0fe7fc97d2b66d74.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix tests
Fix bug #69207 - move_uploaded_file allows nulls in path
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 4f2505a02d..7eacd81d93 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5805,7 +5805,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; } |