[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libkdepim/Applications/17.04] src/libkdepim/misc: Fix potential crash
From:       Montel Laurent <null () kde ! org>
Date:       2017-05-13 6:55:24
Message-ID: E1d9QxY-0005tv-K6 () code ! kde ! org
[Download RAW message or body]

Git commit a1a485d3d52313fb1569250acb332dad41c7f91c by Montel Laurent.
Committed on 13/05/2017 at 06:55.
Pushed by mlaurent into branch 'Applications/17.04'.

Fix potential crash

M  +6    -2    src/libkdepim/misc/maillistdrag.cpp

https://commits.kde.org/libkdepim/a1a485d3d52313fb1569250acb332dad41c7f91c

diff --git a/src/libkdepim/misc/maillistdrag.cpp b/src/libkdepim/misc/maill=
istdrag.cpp
index 5e17a57..be508a4 100644
--- a/src/libkdepim/misc/maillistdrag.cpp
+++ b/src/libkdepim/misc/maillistdrag.cpp
@@ -139,7 +139,11 @@ QString MailList::mimeDataType()
 =

 bool MailList::canDecode(const QMimeData *md)
 {
-    return md->hasFormat(mimeDataType());
+    if (md) {
+        return md->hasFormat(mimeDataType());
+    } else {
+        return false;
+    }
 }
 =

 void MailList::populateMimeData(QMimeData *md)
@@ -148,7 +152,7 @@ void MailList::populateMimeData(QMimeData *md)
      Add them in this order */
 =

     /* Popuplate the MimeData with the custom streaming x-kmail-drag/messa=
ge-list mime type */
-    if (count()) {
+    if (md && count()) {
         QByteArray array;
         QBuffer buffer(&array, nullptr);
         buffer.open(QIODevice::WriteOnly);
[prev in list] [next in list] [prev in thread] [next in thread]