Prevent crash when sending file with unrecognised file extension (no …

…associated mime type) Signed-off-by: Nicolas Buquet <[email protected]>
Topheee · Sep 27, 2023 · 36a9d9c · 36a9d9c
1 parent 8bf8711
commit 36a9d9c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/MatrixSDK/Data/MXRoom.m b/MatrixSDK/Data/MXRoom.m
@@ -1020,7 +1020,7 @@ - (MXHTTPOperation*)sendImage:(NSData*)imageData
  kMXMessageBodyKey: filename,
  @"url": fakeMediaURI,
  @"info": [@{
- @"mimetype": mimetype,
+ @"mimetype": (mimeType ?: @"@application/octet-stream"),
  @"w": @(imageSize.width),
  @"h": @(imageSize.height),
  @"size": @(imageData.length)
@@ -1347,7 +1347,7 @@ - (MXHTTPOperation*)sendVideoAsset:(AVAsset*)videoAsset
  }
 
  // update metadata with result of converter output
- msgContent[@"info"][@"mimetype"] = mimetype;
+ msgContent[@"info"][@"mimetype"] = (mimeType ?: @"@application/octet-stream");
  msgContent[@"info"][@"w"] = @(size.width);
  msgContent[@"info"][@"h"] = @(size.height);
  msgContent[@"info"][@"duration"] = @((int)floor(durationInMs));
@@ -1670,15 +1670,15 @@ - (MXHTTPOperation*)_sendFile:(NSURL*)fileLocalURL
  kMXMessageBodyKey: filename,
  @"url": fakeMediaURI,
  @"info": @{
- @"mimetype": mimeType,
+ @"mimetype": (mimeType ?: @"@application/octet-stream"),
  @"size": @(fileData.length)
  },
  kMXMessageContentKeyExtensibleTextMSC1767: filename,
  kMXMessageContentKeyExtensibleFileMSC1767: @{
  kMXMessageContentKeyExtensibleFileSize: @(fileData.length),
  kMXMessageContentKeyExtensibleFileName: filename,
  kMXMessageContentKeyExtensibleFileURL: fakeMediaURI,
- kMXMessageContentKeyExtensibleFileMimeType: mimeType
+ kMXMessageContentKeyExtensibleFileMimeType: (mimeType ?: @"@application/octet-stream")
  }.mutableCopy}.mutableCopy;
 
  if(additionalTypes.count)

diff --git a/changelog.d/mimetype.bugfix b/changelog.d/mimetype.bugfix
@@ -0,0 +1 @@
+Prevent crash when sending file with unrecognised file extension (no associated mime type)