diff options
| author | Hannes Magnusson <bjori@php.net> | 2011-05-29 12:29:19 +0000 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2011-05-29 12:29:19 +0000 |
| commit | 3b030ec75f51ef16347f548853471f7baf48bb5c (patch) | |
| tree | dde0ce0f7751ead06fd455df4f96f158898d7889 /main/streams/streams.c | |
| parent | 07bcf1080d38e7b5e927d4d1449984b39918a030 (diff) | |
| download | php-git-3b030ec75f51ef16347f548853471f7baf48bb5c.tar.gz | |
Fixed bug #54946 (stream_get_contents infinite loop)
Diffstat (limited to 'main/streams/streams.c')
| -rwxr-xr-x | main/streams/streams.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index aafb652a08..5029f5cd02 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1291,6 +1291,9 @@ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen ptr = *buf = pemalloc_rel_orig(maxlen + 1, persistent); while ((len < maxlen) && !php_stream_eof(src)) { ret = php_stream_read(src, ptr, maxlen - len); + if (!ret) { + break; + } len += ret; ptr += ret; } |