Merge pull request #1749 from nextcloud/check-nan-for-preview

Fix potential crash on invalid preview size
nextcloud · Aug 9, 2024 · 6fae87c · 6fae87c
2 parents d98b583 + bc4d26e
commit 6fae87c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/NextcloudTalk/BaseChatTableViewCell+File.swift b/NextcloudTalk/BaseChatTableViewCell+File.swift
@@ -152,12 +152,17 @@ extension BaseChatTableViewCell {
             self.filePreviewActivityIndicator?.isHidden = true
             self.filePreviewActivityIndicator?.stopAnimating()
 
-            imageView.layer.borderColor = UIColor.secondarySystemFill.cgColor
-            imageView.layer.borderWidth = 1
-
             let imageSize = CGSize(width: image.size.width * image.scale, height: image.size.height * image.scale)
             let previewSize = BaseChatTableViewCell.getPreviewSize(from: imageSize, isMediaFile)
 
+            if !previewSize.width.isFinite || !previewSize.height.isFinite {
+                self.showFallbackIcon(for: message)
+                return
+            }
+
+            imageView.layer.borderColor = UIColor.secondarySystemFill.cgColor
+            imageView.layer.borderWidth = 1
+
             self.filePreviewImageViewHeightConstraint?.constant = previewSize.height
             self.filePreviewImageViewWidthConstraint?.constant = previewSize.width