From 90b033d777b8694b77274724a1e051fcf58ac139 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 21 Nov 2023 16:26:54 +0100 Subject: [PATCH] macOS: Don't crash when starting a drag with empty mime data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As with all drag'n'drop code, we can't auto-test this as the test would enter a blocking event loop. Task-number: QTBUG-119216 Pick-to: 6.5 Change-Id: I7bab4a4fe7f5b315cdaec61636ded6186d9f75b4 Reviewed-by: Tor Arne Vestbø (cherry picked from commit 09afa7575276d7b500f17671a1ca9ca677767b44) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/cocoa/qcocoadrag.mm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm index a8c0392f8ba..5fb3c5141a7 100644 --- a/src/plugins/platforms/cocoa/qcocoadrag.mm +++ b/src/plugins/platforms/cocoa/qcocoadrag.mm @@ -97,6 +97,8 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) { m_drag = o; m_executed_drop_action = Qt::IgnoreAction; + if (o->mimeData()->formats().isEmpty()) + return m_executed_drop_action; QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QUtiMimeConverter::HandlerScopeFlag::DnD); m_drag->mimeData()->setData("application/x-qt-mime-type-name"_L1, QByteArray("dummy"));