Merge branch 'develop' into mauroromito/filter_implementation

element-hq · Feb 8, 2024 · 4462c64 · 4462c64
2 parents 2780634 + e1d1e99
commit 4462c64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
@@ -134,7 +134,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
         var aspectRatio: CGFloat?
         let width = imageInfo.width.map(CGFloat.init)
         let height = imageInfo.height.map(CGFloat.init)
-        if let width, let height {
+        if let width, let height, width > 0, height > 0 {
             aspectRatio = width / height
         }
 
@@ -488,7 +488,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
         let height = messageContent.info?.height.map(CGFloat.init)
 
         var aspectRatio: CGFloat?
-        if let width, let height {
+        if let width, let height, width > 0, height > 0 {
             aspectRatio = width / height
         }
 
@@ -508,7 +508,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
         let height = messageContent.info?.height.map(CGFloat.init)
 
         var aspectRatio: CGFloat?
-        if let width, let height {
+        if let width, let height, width > 0, height > 0 {
             aspectRatio = width / height
         }
 

diff --git a/changelog.d/pr-2437.bugfix b/changelog.d/pr-2437.bugfix
@@ -0,0 +1 @@
+Prevent crashes when computing aspect ratios on zero media width or height
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Prevent crashes when computing aspect ratios on zero media width or height