cvs: php-src /ext/standard streamsfuncs.c
| From: | Wez Furlong | Date: | Fri, 05 Dec 2003 20:25:15 +0000 |
| Subject: | cvs: php-src /ext/standard streamsfuncs.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-24969@lists.php.net to get a copy of this message | ||
wez Fri Dec 5 15:25:15 2003 EDT
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
Probable fix for #26534
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.30 php-src/ext/standard/streamsfuncs.c:1.31
--- php-src/ext/standard/streamsfuncs.c:1.30 Sat Nov 29 16:46:47 2003
+++ php-src/ext/standard/streamsfuncs.c Fri Dec 5 15:25:14 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.30 2003/11/29 21:46:47 wez Exp $ */
+/* $Id: streamsfuncs.c,v 1.31 2003/12/05 20:25:14 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -444,7 +444,9 @@
add_assoc_long(return_value, "unread_bytes", stream->writepos - stream->readpos);
add_assoc_bool(return_value, "seekable", (stream->ops->seek) &&
(stream->flags & PHP_STREAM_FLAG_NO_SEEK) == 0);
- add_assoc_string(return_value, "uri", stream->orig_path, 1);
+ if (stream->orig_path) {
+ add_assoc_string(return_value, "uri", stream->orig_path, 1);
+ }
if (!php_stream_populate_meta_data(stream, return_value)) {
add_assoc_bool(return_value, "timed_out", 0);