Only release when there is no lock on the object

When the widget was unregistered for drag and drop then it would call
Release() on the dropTarget before doing anything else. If the widget
itself did not have a handle then this was not a problem. However in the
case of a widget with a handle then it would call Release() before
the lock on the dropTarget was released which would cause it to crash.

Therefore it is moved so that it is called after the lock is released
to ensure it can be released correctly.

Task-number: QTBUG-13237

Change-Id: Iaec3eb8be3a4ea988218012e973f69cbcdcc45de
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp
index 1e8b030..e39b3cf 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/kernel/qwidget_win.cpp
@@ -1796,10 +1796,10 @@ QOleDropTarget* QWidgetPrivate::registerOleDnd(QWidget *widget)
 
 void QWidgetPrivate::unregisterOleDnd(QWidget *widget, QOleDropTarget *dropTarget)
 {
-    dropTarget->releaseQt();
-    dropTarget->Release();
     Q_ASSERT(widget->testAttribute(Qt::WA_WState_Created));
     if (!widget->internalWinId()) {
+        dropTarget->releaseQt();
+        dropTarget->Release();
         QWidget *nativeParent = widget->nativeParentWidget();
         while (nativeParent) {
             QWExtra *nativeExtra = nativeParent->d_func()->extra;
@@ -1828,6 +1828,8 @@ void QWidgetPrivate::unregisterOleDnd(QWidget *widget, QOleDropTarget *dropTarge
 #ifndef Q_OS_WINCE
         CoLockObjectExternal(dropTarget, false, true);
 #endif
+        dropTarget->releaseQt();
+        dropTarget->Release();
         RevokeDragDrop(widget->internalWinId());
     }
 }