From: Anatol Belski Date: Tue, 3 Jun 2014 09:38:19 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~250 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cdcf3e877809724a76130e699062d543e2c5234;p=php Merge branch 'PHP-5.6' * PHP-5.6: Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files --- 2cdcf3e877809724a76130e699062d543e2c5234