diff options
| author | Antony Dovgal <tony2001@php.net> | 2005-05-23 11:52:44 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2005-05-23 11:52:44 +0000 |
| commit | 1650db955ca9ec3052d2529f77093b792ca8ca3d (patch) | |
| tree | 5f99cdfd5cf14abd5c81620a4bbb7354aa578f26 | |
| parent | 4e03cdce324a08632ff9d03fb86fbeba686a9d7a (diff) | |
| download | php-git-1650db955ca9ec3052d2529f77093b792ca8ca3d.tar.gz | |
MFH: fix bug #32810 (fread after tmpfile() reads only 8192 bytes)
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | main/streams.c | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -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) |