scottmac Tue Oct 9 10:04:20 2007 UTC
Modified files:
/php-src/main fopen_wrappers.c
Log:
Fix expand_filepath when including relative files, ideally you should test
you code...
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.198&r2=1.199&diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.198 php-src/main/fopen_wrappers.c:1.199
--- php-src/main/fopen_wrappers.c:1.198 Tue Oct 9 08:40:25 2007
+++ php-src/main/fopen_wrappers.c Tue Oct 9 10:04:19 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.198 2007/10/09 08:40:25 jani Exp $ */
+/* $Id: fopen_wrappers.c,v 1.199 2007/10/09 10:04:19 scottmac Exp $ */
/* {{{ includes
*/
@@ -593,8 +593,10 @@
copy_len = strlen(filepath) > MAXPATHLEN - 1 ?
MAXPATHLEN - 1 : strlen(filepath);
real_path = estrndup(filepath, copy_len);
return real_path;
+ } else {
+ cwd[0] = '\0';
}
- } else {
+ } else if (!result) {
cwd[0] = '\0';
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
