diff options
| author | Anatol Belski <ab@php.net> | 2019-06-29 17:19:20 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-06-29 17:19:20 +0200 |
| commit | 5ea43c38b3b899f4835f08fb361455b709236e42 (patch) | |
| tree | 7b92b711afca3889fcdc2be30b3a6c7ed5903536 | |
| parent | 9f9657ff92d4ceb45d748582b5f90cab09eede0d (diff) | |
| parent | 5ae0a6b784e90e5c2aa6723b404a7bb91cd5fecc (diff) | |
| download | php-git-5ea43c38b3b899f4835f08fb361455b709236e42.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Set buffer to NULL to prevent double free (Kamil Dudka at redhat)
| -rw-r--r-- | ext/fileinfo/libmagic/buffer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/fileinfo/libmagic/buffer.c b/ext/fileinfo/libmagic/buffer.c index 30cef1acbd..e6a9c706a9 100644 --- a/ext/fileinfo/libmagic/buffer.c +++ b/ext/fileinfo/libmagic/buffer.c @@ -83,6 +83,7 @@ buffer_fill(const struct buffer *bb) FINFO_READ_FUNC(b->fd, b->ebuf, b->elen) != (ssize_t)b->elen) { efree(b->ebuf); + b->ebuf = NULL; goto out; } |