From: John Tapsell <john.tapsell@kdemail.net>
Date: Tue, 27 Nov 2007 20:55:02 +0000 (+0000)
Subject: Do not crash if the index is not valid.
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/edf8be2dffa671faabf0fbf6e93b72441f20da5c

Do not crash if the index is not valid.

svn path=/trunk/KDE/kdebase/apps/; revision=742329
---

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index fbb5f31c6..1e2e66f5a 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -214,10 +214,18 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event)
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     const QModelIndex index = indexAt(event->pos());
     setDirtyRegion(m_dropRect);
-    if (itemForIndex(index).isDir()) {
-        m_dropRect = visualRect(index);
-    } else {
+
+    if(!index.isValid()) {
         m_dropRect.setSize(QSize()); // set as invalid
+    } else {
+        KFileItem item = itemForIndex(index);
+        if (item.isNull()) {
+            kWarning(7007) << "Invalid item returned for index";
+        } else if (itemForIndex(index).isDir()) {
+            m_dropRect = visualRect(index);
+        } else {
+            m_dropRect.setSize(QSize()); // set as invalid
+	}
     }
     setDirtyRegion(m_dropRect);
 }