Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'PHP-5.5'

* PHP-5.5:
  Refactored the previous memleak fix
  • Loading branch information...
commit 6b56ec449bca83bc473e72044866fd8651609e9b 2 parents 8b12bca + a1f66c0
@weltling weltling authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 ext/fileinfo/libmagic/apprentice.c
View
6 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);
}
Please sign in to comment.
Something went wrong with that request. Please try again.