Refactored the previous memleak fix

to avoid usage of a freed pointer. Thanks Laruence )

diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index 06d28ad5c777af043641b72cde14ec4f638963e7..0620fc7f93524b0e4ead61e36dfab5a5040baaa4 100644 (file)
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -492,15 +492,15 @@ apprentice_unmap(struct magic_map *map)
 {
        if (map == NULL)
                return;
-       if (map->p != NULL && map->p != php_magic_database) {
-               efree(map->p);
-       }
        if (map->p != php_magic_database) {
                int j;
                for (j = 0; j < MAGIC_SETS; j++) {
                        if (map->magic[j])
                                efree(map->magic[j]);
                }
+               if (map->p != NULL) {
+                       efree(map->p);
+               }
        }
        efree(map);
 }