From 0909a0bbfbf6de90a79e5c076b0330e99a9a9a93 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Date: Mon, 30 May 2011 15:48:22 +0200
Subject: [PATCH] Made QXcbConnection::atomName() more fail safe.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Samuel Rødal
---
 src/plugins/platforms/xcb/qxcbconnection.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index 8e5391a0d1..89b50722cc 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -730,9 +730,12 @@ QByteArray QXcbConnection::atomName(xcb_atom_t atom)
 {
     xcb_get_atom_name_cookie_t cookie = xcb_get_atom_name_unchecked(xcb_connection(), atom);
     xcb_get_atom_name_reply_t *reply = xcb_get_atom_name_reply(xcb_connection(), cookie, 0);
-    QByteArray result(xcb_get_atom_name_name(reply), xcb_get_atom_name_name_length(reply));
-    free(reply);
-    return result;
+    if (reply) {
+        QByteArray result(xcb_get_atom_name_name(reply), xcb_get_atom_name_name_length(reply));
+        free(reply);
+        return result;
+    }
+    return QByteArray();
 }
 
 void QXcbConnection::sync()