iliaa Tue Sep 12 15:47:25 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams plain_wrapper.c
/php-src NEWS
Log:
Fixed bug #37779 (empty include_path leads to search for files inside /).
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.5&r2=1.52.2.6.2.6&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.5
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.6
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.5 Mon Aug 28 17:15:03 2006
+++ php-src/main/streams/plain_wrapper.c Tue Sep 12 15:47:25 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.5 2006/08/28 17:15:03 tony2001 Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.6 2006/09/12 15:47:25 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1310,11 +1310,13 @@
*end = '\0';
end++;
}
+ if (*ptr == '\0') {
+ goto stream_skip;
+ }
snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename);
if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) &&
php_check_open_basedir_ex(trypath, 0 TSRMLS_CC)) {
- ptr = end;
- continue;
+ goto stream_skip;
}
if (PG(safe_mode)) {
@@ -1327,8 +1329,7 @@
goto stream_done;
}
}
- ptr = end;
- continue;
+ goto stream_skip;
}
stream = php_stream_fopen_rel(trypath, mode, opened_path,
options);
if (stream) {
@@ -1336,6 +1337,7 @@
efree(pathbuf);
return stream;
}
+stream_skip:
ptr = end;
} /* end provided path */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.247&r2=1.2027.2.547.2.248&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.247 php-src/NEWS:1.2027.2.547.2.248
--- php-src/NEWS:1.2027.2.547.2.247 Tue Sep 12 11:01:15 2006
+++ php-src/NEWS Tue Sep 12 15:47:25 2006
@@ -21,6 +21,8 @@
- Fixed bug #38096 (large timeout values ignored on 32bit machines in
stream_socket_accept() and stream_socket_client()). (Ilia)
- Fixed bug #37923 (Display constant value in reflection::export). (Johannes)
+- Fixed bug #37779 (empty include_path leads to search for files inside /).
+ (jr at terragate dot net, Ilia)
31 Aug 2006, PHP 5.2.0RC3
- Updated PCRE to version 6.7. (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
