diff options
| author | Nikita Popov <nikic@php.net> | 2012-05-06 13:33:47 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-05-06 13:33:47 +0200 |
| commit | bef6111609bc05ae99f9392e507a47ae09ef72f9 (patch) | |
| tree | 67aa9398c54a3f6e69c476fb9a742a30d4ed9f4f /main | |
| parent | 0747b29bdf43be0682d10bdfc788f12f19ccf443 (diff) | |
| parent | 304ac568c56799e60d90fadad3a936b61cab281b (diff) | |
| download | php-git-bef6111609bc05ae99f9392e507a47ae09ef72f9.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Add NEWS entry for bug #61961
Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
Diffstat (limited to 'main')
| -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 31473d6b66..db6e25f687 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1437,7 +1437,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; } |