com php-src: Fixed bug #68665 (Invalid free): ext/fileinfo/libmagic/apprentice.c
| From: | Anatol Belski | Date: | Sun, 28 Dec 2014 12:58:01 +0000 |
| Subject: | com php-src: Fixed bug #68665 (Invalid free): ext/fileinfo/libmagic/apprentice.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83900@lists.php.net to get a copy of this message | ||
Commit: a72cd07f2983dc43a6bb35209dc4687852e53c09
Author: Anatol Belski <ab@php.net> Sun, 28 Dec 2014 13:58:01 +0100
Parents: 83e55478279f8bb366e5f5a482619c5e47731980
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a72cd07f2983dc43a6bb35209dc4687852e53c09
Log:
Fixed bug #68665 (Invalid free)
Bugs:
https://bugs.php.net/68665
Changed paths:
M ext/fileinfo/libmagic/apprentice.c
Diff:
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index 543bce5..e7d0a61 100644
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -1197,7 +1197,6 @@ apprentice_load(struct magic_set *ms, const char *fn, int action)
if ((filearr = CAST(char **,
erealloc(filearr, mlen))) == NULL) {
file_oomem(ms, mlen);
- efree(mfn);
php_stream_closedir(dir);
errs++;
goto out;