From e5fa23c3c0a50981bdf1dabca49b5de8250327ac Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 5 Oct 2021 21:07:50 +0200
Subject: [PATCH] [ticket/16883] Check if var is array before using count()
PHPBB3-16883
---
phpBB/includes/diff/diff.php | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php
index d8ae9d77ac..d5d0e3e3f0 100644
--- a/phpBB/includes/diff/diff.php
+++ b/phpBB/includes/diff/diff.php
@@ -168,8 +168,14 @@ class diff
$final = $edit->final;
// We can simplify one case where the array is usually supposed to be empty...
- if (count($orig) == 1 && trim($orig[0]) === '') $orig = array();
- if (count($final) == 1 && trim($final[0]) === '') $final = array();
+ if (is_array($orig) && count($orig) == 1 && trim($orig[0]) === '')
+ {
+ $orig = array();
+ }
+ if (is_array($final) && count($final) == 1 && trim($final[0]) === '')
+ {
+ $final = array();
+ }
if (!$orig && !$final)
{