From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Thu, 6 Jun 2024 14:36:02 +0000 (+0800)
Subject: Prevent crash when originalSize is null
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~6^2~214^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d61a209e532c106712c1853f0c94e43482d3d750;p=nextcloud-desktop.git

Prevent crash when originalSize is null

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/iconutils.cpp b/src/gui/iconutils.cpp
index ba9204e03..22ce38f85 100644
--- a/src/gui/iconutils.cpp
+++ b/src/gui/iconutils.cpp
@@ -108,7 +108,7 @@ QImage createSvgImageWithCustomColor(const QString &fileName,
         return {};
     }
 
-    const auto sizeToUse = requestedSize.isValid() ? requestedSize : *originalSize;
+    const auto sizeToUse = requestedSize.isValid() || originalSize == nullptr ? requestedSize : *originalSize;
 
     // some icons are present in white or black only, so, we need to check both when needed
     const auto iconBaseColors = QStringList{QStringLiteral("black"), QStringLiteral("white")};