From: Antony Dovgal <tony2001@php.net>
Date: Mon, 23 May 2005 11:52:44 +0000 (+0000)
Subject: MFH: fix bug #32810 (fread after tmpfile() reads only 8192 bytes)
X-Git-Tag: php-4.4.0RC1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1650db955ca9ec3052d2529f77093b792ca8ca3d;p=php

MFH: fix bug #32810 (fread after tmpfile() reads only 8192 bytes)
---

diff --git a/NEWS b/NEWS
index 953fdfe789..5401f8dd2f 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ PHP 4                                                                      NEWS
 - Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
 - Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Tony)
 - Fixed bug #32813 (parse_url() does not handle scheme-only urls properly). (Ilia)
+- Fixed bug #32810 (fread after tmpfile() reads only 8192 bytes). (Tony)
 - Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
 - Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
 - Fixed bug #32773 (GMP functions break when second parameter is 0). (Stas)
diff --git a/main/streams.c b/main/streams.c
index fe3575b805..73465b5f36 100755
--- a/main/streams.c
+++ b/main/streams.c
@@ -654,8 +654,9 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS
 		}
 
 		/* 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)