summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@digia.com>2014-09-08 11:06:16 +0200
committerRichard Moe Gustavsen <richard.gustavsen@digia.com>2014-09-11 22:35:01 +0200
commit8e7cb47a3463c4d0f3662d901f7718e7c6cacefe (patch)
tree39a443bc99c0a85f84e3b1b9c8c249c6e6a606a5
parenta14ec355c185c4f8857ae606990ff24d5431e1f8 (diff)
QIOSPasteboard: handle zero-pointer argument to setMimeData
QClipboard sends QPlatformClipboard a zero pointer to QMimeData when it's told to clear. So we need to check for this to avoid a crash. Change-Id: I570ed727029ca699673d7b2e989bdff44df8e161 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
-rw-r--r--src/plugins/platforms/ios/qiosclipboard.mm4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/ios/qiosclipboard.mm b/src/plugins/platforms/ios/qiosclipboard.mm
index 0a7b34a216..e18ad53b2c 100644
--- a/src/plugins/platforms/ios/qiosclipboard.mm
+++ b/src/plugins/platforms/ios/qiosclipboard.mm
@@ -205,6 +205,10 @@ void QIOSClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
Q_ASSERT(supportsMode(mode));
UIPasteboard *pb = [UIPasteboard pasteboardWithQClipboardMode:mode];
+ if (!mimeData) {
+ pb.items = [NSArray array];
+ return;
+ }
NSMutableDictionary *pbItem = [NSMutableDictionary dictionaryWithCapacity:mimeData->formats().size()];
foreach (const QString &mimeType, mimeData->formats()) {