Merge branch 'charlesmchen/linkPreviewsVsIncomingAttachments'

6 years ago · 1ab5a7ed6b
parent aa1f90757c 7d4e89daac
commit 1ab5a7ed6b
1 changed files with 4 additions and 0 deletions
--- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
+++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
@ -116,6 +116,10 @@ public class OWSLinkPreview: MTLModel {
        guard let previewProto = dataMessage.preview.first else {
            throw LinkPreviewError.noPreview
        }
+        guard dataMessage.attachments.count < 1 else {
+            Logger.error("Discarding link preview; message has attachments.")
+            throw LinkPreviewError.invalidInput
+        }
        let urlString = previewProto.url

        guard URL(string: urlString) != nil else {