From 0d57c5111236c06ace5b2759ddb4c63749a057da Mon Sep 17 00:00:00 2001
From: Octavian Voicu <octavian.voicu@gmail.com>
Date: Thu, 6 Aug 2009 14:09:47 +0200
Subject: Fix crash in QX11Data::xdndHandleEnter when XGetWindowProperty fails

Task-number: 259143

Merge-request: 1119
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
---
 src/gui/kernel/qdnd_x11.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
index a15c20f..cc8cc03 100644
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
@@ -825,15 +825,16 @@ void QX11Data::xdndHandleEnter(QWidget *, const XEvent * xe, bool /*passive*/)
         Atom   type = XNone;
         int f;
         unsigned long n, a;
-        unsigned char *retval;
+        unsigned char *retval = 0;
         XGetWindowProperty(X11->display, qt_xdnd_dragsource_xid, ATOM(XdndTypelist), 0,
                            qt_xdnd_max_type, False, XA_ATOM, &type, &f,&n,&a,&retval);
-        Atom *data = (Atom *)retval;
-        for (; j<qt_xdnd_max_type && j < (int)n; j++) {
-            qt_xdnd_types[j] = data[j];
-        }
-        if (data)
+        if (retval) {
+            Atom *data = (Atom *)retval;
+            for (; j<qt_xdnd_max_type && j < (int)n; j++) {
+                qt_xdnd_types[j] = data[j];
+            }
             XFree((uchar*)data);
+        }
     } else {
         // get the types from the message
         int i;
-- 
cgit v0.12