Merge pull request #7429 from vector-im/manu/7406_m_file_format

Manage bad m.file attachment format
element-hq · Mar 16, 2023 · 5a3adde · 5a3adde
2 parents 571deb8 + d672dff
commit 5a3adde
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -1362,14 +1362,21 @@ - (NSAttributedString *)attributedStringFromEvent:(MXEvent*)event
                         {
                             body = body? body : [VectorL10n noticeFileAttachment];
 
-                            NSDictionary *fileInfo = contentToUse[@"info"];
+                            NSDictionary *fileInfo;
+                            MXJSONModelSetDictionary(fileInfo, contentToUse[@"info"]);
                             if (fileInfo)
                             {
-                                NSNumber *fileSize = fileInfo[@"size"];
+                                NSNumber *fileSize;
+                                MXJSONModelSetNumber(fileSize, fileInfo[@"size"])
                                 if (fileSize)
                                 {
                                     body = [NSString stringWithFormat:@"%@ (%@)", body, [MXTools fileSizeToString: fileSize.longValue]];
                                 }
+                                else
+                                {
+                                    MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported m.file format: %@", event.description);
+                                    *error = MXKEventFormatterErrorUnsupported;
+                                }
                             }
                         }
                         else

diff --git a/changelog.d/7406.bugfix b/changelog.d/7406.bugfix
@@ -0,0 +1 @@
+Manage bad m.file attachment format.