[PHP-CVS] cvs: php-src(PHP_5_0) /main/streams streams.c

[Antony Dovgal]

tony2001                Mon May 23 07:52:12 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/main/streams       streams.c 
  Log:
  MFH: fix bug #32810 (fread after tmpfile() reads only 8192 bytes)
  
  
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.61.2.11&r2=1.61.2.12&ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.61.2.11 
php-src/main/streams/streams.c:1.61.2.12
--- php-src/main/streams/streams.c:1.61.2.11    Mon May 16 04:37:41 2005
+++ php-src/main/streams/streams.c      Mon May 23 07:52:12 2005
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: streams.c,v 1.61.2.11 2005/05/16 08:37:41 tony2001 Exp $ */
+/* $Id: streams.c,v 1.61.2.12 2005/05/23 11:52:12 tony2001 Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -592,8 +592,9 @@
                }
 
                /* just break anyway, to avoid greedy read */
-               if (stream->wrapper != &php_plain_files_wrapper)
+               if (stream->wrapper != NULL && stream->wrapper != 
&php_plain_files_wrapper) {
                        break;
+               }
        }
 
        if (didread > 0) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php