diff options
| author | Remi Collet <remi@php.net> | 2014-03-04 13:41:37 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-03-04 13:41:37 +0100 |
| commit | 731013ee8e9cf405101d4fd584214fadb1c1d390 (patch) | |
| tree | 390a667d67f615ed5bc2cea52712d897c6c2c2b2 | |
| parent | 1533f98afddee259444c00a2dea86029002e5cf7 (diff) | |
| download | php-git-731013ee8e9cf405101d4fd584214fadb1c1d390.tar.gz | |
Improves fix for memory leak, keep in sync with upstream.
Previous fix:
http://git.php.net/?p=php-src.git;a=commitdiff;h=10eb0070700382f966bf260e44135e1f724a15d2
Upstream fix:
https://github.com/glensc/file/commit/c0c0032b9e9eb57b91fefef905a3b018bab492d9
| -rw-r--r-- | ext/fileinfo/libmagic/softmagic.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c index 33970e5921..82a470ac57 100644 --- a/ext/fileinfo/libmagic/softmagic.c +++ b/ext/fileinfo/libmagic/softmagic.c @@ -1696,11 +1696,19 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m, ms->o.buf = sbuf; ms->offset = soffset; if (rv == 1) { - if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 && - file_printf(ms, m->desc, offset) == -1) - return -1; - if (file_printf(ms, "%s", rbuf) == -1) + if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 && + file_printf(ms, m->desc, offset) == -1) { + if (rbuf) { + efree(rbuf); + } + return -1; + } + if (file_printf(ms, "%s", rbuf) == -1) { + if (rbuf) { + efree(rbuf); + } return -1; + } } if (rbuf) { efree(rbuf); |