Fixed bug #68827 Double free with disabled ZMM

Joshua Rogers · weltling · commit 91aa340180ec · 2015-01-22T09:59:13.000+01:00
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -2603,8 +2603,7 @@ apprentice_map(struct magic_set ms, const char fn)`
`2603`	`2603`
`2604`	`2604`	`if ((map = CAST(struct magic_map , ecalloc(1, sizeof(map)))) == NULL) {`
`2605`	`2605`	`file_oomem(ms, sizeof(*map));`
`2606`		`- efree(map);`
`2607`		`- goto error;`
	`2606`	`+ return NULL;`
`2608`	`2607`	`}`
`2609`	`2608`
`2610`	`2609`	`if (fn == NULL) {`