From 7d4e89daaca6c8c57ee08c7b0c4c4fae4e1fd8c1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 22 Jan 2019 11:32:19 -0500 Subject: [PATCH] Discard link previews if incoming message has attachments. --- .../src/Messages/Interactions/OWSLinkPreview.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index b72abb478..00ffb6167 100644 --- 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 {