com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/softmagic.c

Commit: 67d281f0937f5a7c7c7ff1905e02d5c5c50b4b7f Author: Anatol Belski <ab@php.net> Thu, 20 Feb 2014 18:55:05 +0100 Parents: fe3c8de9d5d25190dcd77db6e434f0614abb1847 6d4d4155d26f8725365ee24797ecd14cba049a53 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=67d281f0937f5a7c7c7ff1905e02d5c5c50b4b7f Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: fixed leak introduced after CVE/upgrade Changed paths: MM ext/fileinfo/libmagic/softmagic.c Diff: diff --cc ext/fileinfo/libmagic/softmagic.c index fdd57cf,33970e5..a2fec71 --- a/ext/fileinfo/libmagic/softmagic.c +++ b/ext/fileinfo/libmagic/softmagic.c @@@ -1732,11 -1696,13 +1732,13 @@@ mget(struct magic_set *ms, const unsign 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 ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 && + file_printf(ms, F(m->desc, "%u"), offset) == -1) + return -1; if (file_printf(ms, "%s", rbuf) == -1) return -1; + } + if (rbuf) { efree(rbuf); } return rv;