Fixed bug #68827 Double free with disabled ZMM

diff --git a/NEWS b/NEWS
index cd5b4d7f4d8c8c0fde32fc779be75dd48aea9109..5d8a1f99e86dd5fb03e92b0805dea80ecda62ced 100644 (file)
--- 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 b137405da22084b73ffcd65975a538c0f224452a..1cbe0fce5e1c0c325b2d3f474be530d22caf4846 100644 (file)
--- 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) {