From: Felipe Pena <felipe@php.net>
Date: Wed, 21 Apr 2010 22:22:31 +0000 (+0000)
Subject: - Fixed bug #51627 (script path not correctly evaluated)
X-Git-Tag: php-5.4.0alpha1~191^2~1714
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10e7361027f22bf6efe521cf218cdf7ff54e155e;p=php

- Fixed bug #51627 (script path not correctly evaluated)
  Patch by: russell dot tempero at rightnow dot com
---

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);