diff options
| author | Nikita Popov <nikic@php.net> | 2012-05-06 13:40:06 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-05-06 13:40:06 +0200 |
| commit | 9e1b690e0ce4b29416bd9f514a660d12e993aeab (patch) | |
| tree | 6e3c71cc1aa717c3850e4a4efb0ee9f3bc05340b /main/streams/streams.c | |
| parent | 71e7c854b15db08c7bd9355791f859b5cea6e490 (diff) | |
| parent | bef6111609bc05ae99f9392e507a47ae09ef72f9 (diff) | |
| download | php-git-9e1b690e0ce4b29416bd9f514a660d12e993aeab.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Add NEWS entry for bug #61961
Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
Diffstat (limited to 'main/streams/streams.c')
| -rwxr-xr-x | main/streams/streams.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index 35580739cb..3f868b2bd7 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1432,7 +1432,12 @@ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen len += ret; ptr += ret; } - *ptr = '\0'; + if (len) { + *ptr = '\0'; + } else { + pefree(*buf, persistent); + *buf = NULL; + } return len; } |