From cafb14dffbc934455d7d6a93e52ae183fb7f9d35 Mon Sep 17 00:00:00 2001
From: Amir Sarabadani <Ladsgroup@gmail.com>
Date: Wed, 23 Jun 2021 23:44:54 +0200
Subject: [PATCH] Check for _error in getting metadata array in PNGHandler

Before I039785d5b6, it would just suppress errors and return empty value
in which shorten out. Now, it returns [ '_error' => some value ] which
is not empty value but doesn't have anything this method wants either.

Bug: T285431
Change-Id: Ia2bc0982ffaeda0575af1481f9b84faad7d784ad
---
 includes/media/PNGHandler.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/includes/media/PNGHandler.php b/includes/media/PNGHandler.php
index 2723cfc09ee..b6045d05917 100644
--- a/includes/media/PNGHandler.php
+++ b/includes/media/PNGHandler.php
@@ -150,7 +150,11 @@ class PNGHandler extends BitmapHandler {
 
 		$metadata = $image->getMetadataArray();
 
-		if ( !$metadata || $metadata['frameCount'] <= 0 ) {
+		if (
+			!$metadata ||
+			( isset( $metadata['_error'] ) && $metadata['_error'] ) ||
+			$metadata['frameCount'] <= 0
+		) {
 			return $original;
 		}