From 22306e1576cc80943b8d913aed0287d82d912499 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 3 Dec 2024 16:14:14 +0100
Subject: [PATCH] Add proper error handling for damaged images

---
 ts/WoltLabSuite/Core/Component/File/Upload.ts          | 10 +++++++---
 .../js/WoltLabSuite/Core/Component/File/Upload.js      |  6 +++++-
 .../PreloadPhrasesCollectingListener.class.php         |  1 +
 wcfsetup/install/lang/de.xml                           |  1 +
 wcfsetup/install/lang/en.xml                           |  1 +
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ts/WoltLabSuite/Core/Component/File/Upload.ts b/ts/WoltLabSuite/Core/Component/File/Upload.ts
index e43ccb5c4d..476a94d6f9 100644
--- a/ts/WoltLabSuite/Core/Component/File/Upload.ts
+++ b/ts/WoltLabSuite/Core/Component/File/Upload.ts
@@ -268,9 +268,13 @@ export function setup(): void {
         return;
       }
 
-      void resizeImage(element, file).then((resizedFile) => {
-        void upload(element, resizedFile);
-      });
+      void resizeImage(element, file)
+        .then((resizedFile) => {
+          void upload(element, resizedFile);
+        })
+        .catch(() => {
+          innerError(element, getPhrase("wcf.upload.error.damagedImageFile", { filename: file.name }));
+        });
     });
 
     element.addEventListener("ckeditorDrop", (event: CustomEvent<CkeditorDropEvent>) => {
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/File/Upload.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/File/Upload.js
index 1dad3ed9be..fc70bf44f2 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/File/Upload.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/File/Upload.js
@@ -183,8 +183,12 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Helper/Selector", "Wol
                 else if (!validateFileSize(element, file)) {
                     return;
                 }
-                void resizeImage(element, file).then((resizedFile) => {
+                void resizeImage(element, file)
+                    .then((resizedFile) => {
                     void upload(element, resizedFile);
+                })
+                    .catch(() => {
+                    (0, Util_1.innerError)(element, (0, Language_1.getPhrase)("wcf.upload.error.damagedImageFile", { filename: file.name }));
                 });
             });
             element.addEventListener("ckeditorDrop", (event) => {
diff --git a/wcfsetup/install/files/lib/system/event/listener/PreloadPhrasesCollectingListener.class.php b/wcfsetup/install/files/lib/system/event/listener/PreloadPhrasesCollectingListener.class.php
index 6bced647c0..13c7e60ae6 100644
--- a/wcfsetup/install/files/lib/system/event/listener/PreloadPhrasesCollectingListener.class.php
+++ b/wcfsetup/install/files/lib/system/event/listener/PreloadPhrasesCollectingListener.class.php
@@ -150,6 +150,7 @@ final class PreloadPhrasesCollectingListener
 
         $event->preload('wcf.style.changeStyle');
 
+        $event->preload('wcf.upload.error.damagedImageFile');
         $event->preload('wcf.upload.error.fileExtensionNotPermitted');
         $event->preload('wcf.upload.error.fileSizeTooLarge');
         $event->preload('wcf.upload.error.maximumCountReached');
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 96f2048974..13e4b84f09 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -5562,6 +5562,7 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
 		<item name="wcf.upload.error.reachedRemainingLimit"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} zu viele Dateien ausgewählt. {if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst{else}Sie können{/if} nur noch {#$maxFiles} weitere Datei{if $maxFiles != 1}en{/if} hochladen.]]></item>
 		<item name="wcf.upload.error.uploadFailed"><![CDATA[Beim Hochladen der Datei ist ein unbekannter Fehler aufgetreten.]]></item>
 		
+		<item name="wcf.upload.error.damagedImageFile"><![CDATA[Die Grafikdatei „{$filename}“ ist beschädigt.]]></item>
 		<item name="wcf.upload.error.fileExtensionNotPermitted"><![CDATA[Der Dateityp von „{$filename}“ ist unzulässig.]]></item>
 		<item name="wcf.upload.error.fileSizeTooLarge"><![CDATA[Die Datei ist zu groß.]]></item>
 		<item name="wcf.upload.error.maximumCountReached"><![CDATA[Es {plural value=$maximumCount 1='darf nur eine Datei' other='dürfen nur # Dateien'} hochgeladen werden.]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index e9dad53624..770ce9fd83 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -5564,6 +5564,7 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
 		<item name="wcf.upload.error.reachedRemainingLimit"><![CDATA[You have selected too many files. You can only upload {#$maxFiles} more file{if $maxFiles != 1}s{/if}.]]></item>
 		<item name="wcf.upload.error.uploadFailed"><![CDATA[An unknown error occurred during the upload.]]></item>
 
+		<item name="wcf.upload.error.damagedImageFile"><![CDATA[The graphics file “{$filename}” is damaged.]]></item>
 		<item name="wcf.upload.error.fileExtensionNotPermitted"><![CDATA[The file type of “{$filename}” is not permitted.]]></item>
 		<item name="wcf.upload.error.fileSizeTooLarge"><![CDATA[The file is too large.]]></item>
 		<item name="wcf.upload.error.maximumCountReached"><![CDATA[{plural value=$maximumCount 1='Only one file' other='Only up to # files'} may be uploaded.]]></item>
-- 
2.20.1