diff options
| author | Joshua Rogers <bugreports@internot.info> | 2015-01-22 09:59:13 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-22 09:59:13 +0100 |
| commit | 91aa340180eccfc15d4a143b54d47b8120f898be (patch) | |
| tree | 0d30ac6b841355e369eb999681ae68e63d3e5ed4 | |
| parent | 251745c012a42ca131767d02d06ef373a790e115 (diff) | |
| download | php-git-91aa340180eccfc15d4a143b54d47b8120f898be.tar.gz | |
Fixed bug #68827 Double free with disabled ZMM
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/apprentice.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -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) { |