diff options
| author | Volker Hilsheimer <[email protected]> | 2023-11-21 16:26:54 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <[email protected]> | 2023-11-22 07:18:08 +0100 |
| commit | 09afa7575276d7b500f17671a1ca9ca677767b44 (patch) | |
| tree | 51e555d792a6ffcb0fa283ea0028f9049501a95e | |
| parent | b7657ddccbe0a5ab1cdfc61ae6b7f0501dbfb24a (diff) | |
macOS: Don't crash when starting a drag with empty mime data
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.6 6.5
Change-Id: I7bab4a4fe7f5b315cdaec61636ded6186d9f75b4
Reviewed-by: Tor Arne Vestbø <[email protected]>
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoadrag.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm index 5089b4a44bc..515fadfd08c 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")); |