summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--ext/fileinfo/libmagic/apprentice.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index cd5b4d7f4d..5d8a1f99e8 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ PHP NEWS
- Dba:
. Fixed bug #68711 (useless comparisons). (bugreports at internot dot info)
+- Fileinfo:
+ . Fixed bug #68827 (Double free with disabled ZMM). (Joshua Rogers)
+
- OpenSSL:
. Fixed bug #55618 (use case-insensitive cert name matching).
(Daniel Lowrey)
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index b137405da2..1cbe0fce5e 100644
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -2603,8 +2603,7 @@ apprentice_map(struct magic_set *ms, const char *fn)
if ((map = CAST(struct magic_map *, ecalloc(1, sizeof(*map)))) == NULL) {
file_oomem(ms, sizeof(*map));
- efree(map);
- goto error;
+ return NULL;
}
if (fn == NULL) {