From 093a23d1c4d8a6a986211aa00b672dc3392f438a Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Thu, 22 Jan 2015 12:26:50 +0100
Subject: [PATCH] Fixed bug #68731 finfo_buffer doesn't extract the correct
 mime with some gifs

The fix for bug #67647 applies here, too.
---
 NEWS                             |   2 ++
 ext/fileinfo/tests/68731.gif     | Bin 0 -> 1130 bytes
 ext/fileinfo/tests/bug68731.phpt |  14 ++++++++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 ext/fileinfo/tests/68731.gif
 create mode 100644 ext/fileinfo/tests/bug68731.phpt

diff --git a/NEWS b/NEWS
index f83cab81d1..01621236eb 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@
   . Fixed bug #68827 (Double free with disabled ZMM). (Joshua Rogers)
   . Fixed bug #67647 (Bundled libmagic 5.17 does not detect quicktime files
     correctly). (Anatol)
+  . Fixed bug #68731 (finfo_buffer doesn't extract the correct mime with some
+    gifs). (Anatol)
 
 - Opcache:
   . Fixed bug with try blocks being removed when extended_info opcode
diff --git a/ext/fileinfo/tests/68731.gif b/ext/fileinfo/tests/68731.gif
new file mode 100644
index 0000000000000000000000000000000000000000..328e552109df0cf875d81347841d0b8779bf0301
GIT binary patch
literal 1130
zcmeH`{Zq>U0LGuSSueQa(w&#w8W(qxyrsNcmTDU!Ib3wvYGY*-a&;%Y2#qDt%O%BH
zT~|{3u6<K&YcEY&D=Nj6mn=qkIZo#scailU_yasYJoo(cJa^CChs_NO2;?)sz}Rg}
zE2siN^^QR@Dysp(4G1ZxO}l~~qCl7eY=u)O0S@6DMu1CTJArT|b~hqYg}qAmT`KG&
zv7hvaAaQ_1)ICHs&5vwC^nJusBc>ULo553prvk4T{AR?Gh;2cv7J_=j*}WA4wNF$n
zgsqOkCLHO&Q4>UJ#H*2@#xV^Nx*^uA<hLSGizF>h4C16IAdWzC8<KT6qeIHQ&B6wp
ze!l*wJ?oLG-y$M6#Osk}*eo_|5$lm|M1~d_Mz**fnZ^}oRP5tQq>mu09p_D)L=xF1
zTzY^U10-rlI&k?Rr1z0C3Tfw#lnz`qBhQR$UH+MR<agnQ1qI!>VM9?Tin>wMgW{fO
zdw=O;+<J_%UX+fZyibs=!JWQvsT#8WBbT(Ou%U7QRRagFwxD_twNFtqj=RrLH;|O8
zL!CX0pkWA#At)_SSkc&z#vzb>P(4S>OQ=WC_8JB&45KiPqSFTRJ9NKC?_2bZqyK}$
zlNT8Lh+!*Ue8H;^c=Z*wiK+kkhX=g=%-MEI$WImu7%B0|A_kiq9s#dkG>QwR;4@9f
zG$?TTgDK}l971Nyrc;KmXA>2s46$x$puEarl2UV$I1KC7iwk%8Z4_Jwi|XX+;cjpX
zS=vr<VeTY&{9xLQS*Zaut6%1YnVws7e-iw5szaFDgnf@H@mM1=M|?9n&>Z*7@;&#{
zi=MYQD9u)~x;>a$f5@}gyhqSg;LS-NVz5|s9QV-b=;6k9mO`fgI`^Gtm6wbCggyD+
zVlPT^jJ{K==cpb&y5*l>h{#$rpHmu;`onfpMV~ol7EREY>m<9&eQ3^7+Z%SjJoL(B
zS>EJV*GhK&0<SBNG_ob!0;VT3CXFZGUg9$^VI+U<vhbc-*UuzZ!&)BqeQmVG)+Uq8
y^Bpf-RU)V7x_xrixyel-lUbY8oWPSAjIy=AXAgFIQd|TQ#tiQo*?9^DoBjglaDf~E

literal 0
HcmV?d00001

diff --git a/ext/fileinfo/tests/bug68731.phpt b/ext/fileinfo/tests/bug68731.phpt
new file mode 100644
index 0000000000..cba790925e
--- /dev/null
+++ b/ext/fileinfo/tests/bug68731.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Bug #68731 finfo_buffer doesn't extract the correct mime with some gifs
+--SKIPIF--
+<?php
+if (!class_exists('finfo'))
+	die('skip no fileinfo extension');
+--FILE--
+<?php
+	$buffer = file_get_contents(dirname(__FILE__) . '/68731.gif');
+	$finfo = finfo_open(FILEINFO_MIME_TYPE);
+	echo finfo_buffer($finfo, $buffer);
+?>
+--EXPECT--
+image/gif
-- 
2.40.0