From f3c077e2b17d784a78c1dae96f4b487edbdfdb6e Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Fri, 6 Jan 2012 16:17:04 +0000
Subject: [PATCH] XCF: suppress warning on unpack + early exit on error

follow r108141
---
 includes/media/XCF.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/includes/media/XCF.php b/includes/media/XCF.php
index 385e988941..b113d70d38 100644
--- a/includes/media/XCF.php
+++ b/includes/media/XCF.php
@@ -78,6 +78,7 @@ class XCFHandler extends BitmapHandler {
 		#                         1: Grayscale
 		#                         2: Indexed color
 		#        (enum GimpImageBaseType in libgimpbase/gimpbaseenums.h)
+		wfSuppressWarnings();
 		$header = unpack(
 			  "A9magic"     # A: space padded
 			. "/a5version"  # a: zero padded
@@ -86,6 +87,11 @@ class XCFHandler extends BitmapHandler {
 			. "/Nbase_type" # /
 		, $binaryHeader
 		);
+		wfRestoreWarnings();
+
+		if( $header === false ) {
+			return false;
+		}
 
 		# Check values
 		if( $header['magic'] !== 'gimp xcf' ) {
-- 
2.20.1