cvs: php-src /main fopen_wrappers.c
| From: | Rasmus Lerdorf | Date: | Thu, 18 Jun 2009 06:39:11 +0000 |
| Subject: | cvs: php-src /main fopen_wrappers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-58819@lists.php.net to get a copy of this message | ||
rasmus Thu Jun 18 06:39:11 2009 UTC
Modified files:
/php-src/main fopen_wrappers.c
Log:
Fix bug #48592
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.213&r2=1.214&diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.213 php-src/main/fopen_wrappers.c:1.214
--- php-src/main/fopen_wrappers.c:1.213 Tue Mar 10 23:39:53 2009
+++ php-src/main/fopen_wrappers.c Thu Jun 18 06:39:11 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.213 2009/03/10 23:39:53 helly Exp $ */
+/* $Id: fopen_wrappers.c,v 1.214 2009/06/18 06:39:11 rasmus Exp $ */
/* {{{ includes
*/
@@ -403,7 +403,9 @@
}
} /* if doc_root && path_info */
- filename = zend_resolve_path(filename, strlen(filename) TSRMLS_CC);
+ if(filename) {
+ filename = zend_resolve_path(filename, strlen(filename) TSRMLS_CC);
+ }
if (!filename) {
/* we have to free SG(request_info).path_translated here because