Fixed bug #68827 Double free with disabled ZMM

12 years ago · 91aa340180
2 changed files with 4 additions and 2 deletions
--- a/3
+++ b/3
@ -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)
--- 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) {