From 2465d6df007a360af1d1932e2d4eeec8374c6d1e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 20 Mar 2018 10:42:17 -0400 Subject: [PATCH] CR: ensure image is safe before generating thumbnail // FREEBIE --- .../src/Messages/Attachments/TSAttachmentStream.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m index 26203f3f8..e0734b9aa 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m @@ -364,6 +364,11 @@ NS_ASSUME_NONNULL_BEGIN UIImage *_Nullable result; if (self.isImage || self.isAnimated) { + if (![NSData ows_isValidImageAtPath:self.filePath]) { + DDLogWarn(@"%@ skipping thumbnail generation for invalid image at path: %@", self.logTag, self.filePath); + return; + } + CGImageSourceRef imageSource = CGImageSourceCreateWithURL((__bridge CFURLRef)self.mediaURL, NULL); OWSAssert(imageSource != NULL) NSDictionary *imageOptions = @{ (NSString const *)kCGImageSourceCreateThumbnailFromImageIfAbsent : (NSNumber const *)kCFBooleanTrue,