diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-07-19 00:51:27 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-07-19 00:51:27 -0700 |
| commit | 1a886926920acd6168cdff9f097bc20fc839a7f7 (patch) | |
| tree | efb4e77ac7f3c273c79e778158f3e6671715f4d1 | |
| parent | 9bb5f64871bb84d421a5fb8f5012504d07cb878a (diff) | |
| parent | a099545bec28c7ebe1641c8a45b68709901f6893 (diff) | |
| download | php-git-1a886926920acd6168cdff9f097bc20fc839a7f7.tar.gz | |
Merge branch 'PHP-5.6.24' into PHP-5.6
* PHP-5.6.24:
Fix for bug #72513
5.6.24RC1
Conflicts:
configure.in
main/php_version.h
| -rw-r--r-- | Zend/zend_virtual_cwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c index c8e42ddc60..84a3508ded 100644 --- a/Zend/zend_virtual_cwd.c +++ b/Zend/zend_virtual_cwd.c @@ -1190,7 +1190,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func int add_slash; void *tmp; - if (path_length == 0 || path_length >= MAXPATHLEN-1) { + if (path_length <= 0 || path_length >= MAXPATHLEN-1) { #ifdef TSRM_WIN32 # if _MSC_VER < 1300 errno = EINVAL; |