From bb1681f965f610e3f84c9808c1941c99c43c4368 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 30 Aug 2017 12:53:02 -0400
Subject: [PATCH] Respond to CR.

// FREEBIE
---
 .../src/Messages/Attachments/TSAttachmentStream.m            | 5 +++--
 SignalServiceKit/src/Util/NSData+Image.m                     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
index f008b7957..730138a0f 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
@@ -258,10 +258,11 @@ NS_ASSUME_NONNULL_BEGIN
         if (!mediaUrl) {
             return nil;
         }
-        if (![NSData ows_isValidImageAtPath:mediaUrl.path]) {
+        NSData *data = [NSData dataWithContentsOfURL:mediaUrl];
+        if (![data ows_isValidImage]) {
             return nil;
         }
-        return [UIImage imageWithData:[NSData dataWithContentsOfURL:mediaUrl]];
+        return [UIImage imageWithData:data];
     } else {
         return nil;
     }
diff --git a/SignalServiceKit/src/Util/NSData+Image.m b/SignalServiceKit/src/Util/NSData+Image.m
index 7cd66c21c..987f54ee1 100644
--- a/SignalServiceKit/src/Util/NSData+Image.m
+++ b/SignalServiceKit/src/Util/NSData+Image.m
@@ -18,7 +18,7 @@ typedef NS_ENUM(NSInteger, ImageFormat) {
 + (BOOL)ows_isValidImageAtPath:(NSString *)filePath
 {
     NSError *error = nil;
-    NSData *data = [NSData dataWithContentsOfFile:filePath options:NSMappedRead error:&error];
+    NSData *data = [NSData dataWithContentsOfFile:filePath options:NSDataReadingMappedIfSafe error:&error];
     if (error) {
         DDLogError(@"%@ could not read image data: %@", self.tag, error);
     }