From: Anatol Belski <ab@php.net>
Date: Thu, 20 Feb 2014 17:55:05 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67d281f0937f5a7c7c7ff1905e02d5c5c50b4b7f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed leak introduced after CVE/upgrade
---

67d281f0937f5a7c7c7ff1905e02d5c5c50b4b7f
diff --cc ext/fileinfo/libmagic/softmagic.c
index fdd57cfbe1,33970e5921..a2fec71974
--- 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;