diff options
| author | Anatol Belski <ab@php.net> | 2014-12-28 14:02:25 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-28 14:02:25 +0100 |
| commit | ef89ab2f99fbd9b7b714556d4f1f50644eb54191 (patch) | |
| tree | a5aa444e308e1f30638d351551b654a5741f705a | |
| parent | 9a7ee202bb60da68e84fac991d2635569f243474 (diff) | |
| parent | 422f323982730f5a42debb2c71285d0958d196d2 (diff) | |
| download | php-git-ef89ab2f99fbd9b7b714556d4f1f50644eb54191.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWs
Fixed bug #68665 (Invalid free)
| -rw-r--r-- | ext/fileinfo/libmagic/apprentice.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c index 83eb1f44f7..0bdbbc90bb 100644 --- a/ext/fileinfo/libmagic/apprentice.c +++ b/ext/fileinfo/libmagic/apprentice.c @@ -1195,7 +1195,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; |