diff options
| author | Remi Collet <remi@php.net> | 2014-03-04 13:46:21 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-03-04 13:46:21 +0100 |
| commit | 834b719cf5808351904734bab5f97f2e88d8176e (patch) | |
| tree | 029ed193ca2efff6d31faf5720fb2652a1abdc22 | |
| parent | f7e381eef67b03e2a18b14db121d11506600fc49 (diff) | |
| parent | bc0b6e02e4ba10cad6bdb7b8593ae5beae3cf3d0 (diff) | |
| download | php-git-834b719cf5808351904734bab5f97f2e88d8176e.tar.gz | |
fix merge
| -rw-r--r-- | ext/fileinfo/libmagic/softmagic.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c index a2fec71974..a4b6627971 100644 --- a/ext/fileinfo/libmagic/softmagic.c +++ b/ext/fileinfo/libmagic/softmagic.c @@ -1733,10 +1733,18 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m, ms->offset = soffset; if (rv == 1) { if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 && - file_printf(ms, F(m->desc, "%u"), offset) == -1) + file_printf(ms, m->desc, offset) == -1) { + if (rbuf) { + efree(rbuf); + } return -1; - if (file_printf(ms, "%s", rbuf) == -1) + } + if (file_printf(ms, "%s", rbuf) == -1) { + if (rbuf) { + efree(rbuf); + } return -1; + } } if (rbuf) { efree(rbuf); |