diff options
| author | Felipe Pena <felipe@php.net> | 2010-04-21 22:22:31 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-04-21 22:22:31 +0000 |
| commit | 10e7361027f22bf6efe521cf218cdf7ff54e155e (patch) | |
| tree | 0ff35f49d4941a99c6447ee56f1bf0abab2373a6 | |
| parent | 5e2cba90c99ff39c548a237f8866f892da45a1fe (diff) | |
| download | php-git-10e7361027f22bf6efe521cf218cdf7ff54e155e.tar.gz | |
- Fixed bug #51627 (script path not correctly evaluated)
Patch by: russell dot tempero at rightnow dot com
| -rw-r--r-- | main/fopen_wrappers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index f7bd5107e1..70ae442655 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -435,8 +435,8 @@ PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC) } } else #endif - if (PG(doc_root) && path_info && (length = strlen(PG(doc_root)) && - IS_ABSOLUTE_PATH(PG(doc_root), length))) { + if (PG(doc_root) && path_info && (length = strlen(PG(doc_root))) && + IS_ABSOLUTE_PATH(PG(doc_root), length)) { filename = emalloc(length + strlen(path_info) + 2); if (filename) { memcpy(filename, PG(doc_root), length); |