com php-src: Fixed bug #68827 Double free with disabled ZMM: NEWS ext/fileinfo/libmagic/apprentice.c

Commit: 91aa340180eccfc15d4a143b54d47b8120f898be Author: Joshua Rogers <bugreports@internot.info> Thu, 22 Jan 2015 09:59:13 +0100 Committer: Anatol Belski <ab@php.net> Thu, 22 Jan 2015 09:59:13 +0100 Parents: 251745c012a42ca131767d02d06ef373a790e115 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=91aa340180eccfc15d4a143b54d47b8120f898be Log: Fixed bug #68827 Double free with disabled ZMM Bugs: https://bugs.php.net/68827 Changed paths: M NEWS M ext/fileinfo/libmagic/apprentice.c Diff: diff --git a/NEWS b/NEWS index cd5b4d7..5d8a1f9 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 b137405..1cbe0fc 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) {