From f1523f3a44135525c53f772d071c1792e5514163 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 27 Jun 2020 11:41:29 +0200
Subject: [PATCH] Incorrect encoding of conditions

---
 .../files/lib/system/condition/UserTrophyCondition.class.php   | 3 ++-
 wcfsetup/install/files/lib/system/io/Tar.class.php             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/condition/UserTrophyCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserTrophyCondition.class.php
index a80ac69bc8..8d33b04a8b 100644
--- a/wcfsetup/install/files/lib/system/condition/UserTrophyCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserTrophyCondition.class.php
@@ -10,6 +10,7 @@ use wcf\data\DatabaseObjectList;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
 use wcf\util\ArrayUtil;
+use wcf\util\StringUtil;
 
 /**
  * Condition implementation for trophies.
@@ -150,7 +151,7 @@ HTML;
 		$returnValue = "";
 		foreach ($trophies as $trophy) {
 			/** @noinspection PhpVariableVariableInspection */
-			$returnValue .= "<label><input type=\"checkbox\" name=\"".$identifier."[]\" value=\"".$trophy->trophyID."\"".(in_array($trophy->trophyID, $this->$identifier) ? ' checked' : "")."> ".$trophy->getTitle()."</label>";
+			$returnValue .= "<label><input type=\"checkbox\" name=\"".$identifier."[]\" value=\"".$trophy->trophyID."\"".(in_array($trophy->trophyID, $this->$identifier) ? ' checked' : "")."> " . StringUtil::encodeHTML($trophy->getTitle()) . "</label>";
 		}
 		
 		return $returnValue;
diff --git a/wcfsetup/install/files/lib/system/io/Tar.class.php b/wcfsetup/install/files/lib/system/io/Tar.class.php
index 307044a3a5..792ba03620 100644
--- a/wcfsetup/install/files/lib/system/io/Tar.class.php
+++ b/wcfsetup/install/files/lib/system/io/Tar.class.php
@@ -314,7 +314,7 @@ class Tar implements IArchive {
 		$data = unpack($format, $binaryData);
 		
 		// Extract the properties
-		$header['checksum'] = octdec(trim($data['checksum']));
+		$header['checksum'] = @octdec(trim($data['checksum']));
 		if ($header['checksum'] == $checksum) {
 			$header['filename'] = trim($data['filename']);
 			$header['mode'] = octdec(trim($data['mode']));
-- 
2.20.1