summaryrefslogtreecommitdiff
path: root/ext/fileinfo/libmagic
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2019-06-29 17:10:29 +0200
committerAnatol Belski <ab@php.net>2019-06-29 17:13:21 +0200
commit5ae0a6b784e90e5c2aa6723b404a7bb91cd5fecc (patch)
tree57a59aa3353e5cc4cde79f042b4a2de97e787dc0 /ext/fileinfo/libmagic
parent02fc2fe8c91130035e4815059925781eea2d2554 (diff)
downloadphp-git-5ae0a6b784e90e5c2aa6723b404a7bb91cd5fecc.tar.gz
Set buffer to NULL to prevent double free (Kamil Dudka at redhat)
Based on the upstream patch d13204e8da43f1d8a98cf3f74591cde02ecdb2f7.
Diffstat (limited to 'ext/fileinfo/libmagic')
-rw-r--r--ext/fileinfo/libmagic/buffer.c1
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;
}