From d5059601e64882a848f6e6730690c270c7b120c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 19 May 2014 19:06:53 +0200
Subject: Fix overwriting memory for an application icon This resolves Bug 2033

---
 src/kernel/qpixmap_x11.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/kernel/qpixmap_x11.cpp')

diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index cc9c211c4..00564b33c 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -764,6 +764,7 @@ TQImage TQPixmap::convertToImage() const
         else
 #endif
         qSafeXDestroyImage( xi );
+	((TQPixmap*)this)->data->ximage = 0;
 	return image;
     }
 
@@ -947,7 +948,8 @@ TQImage TQPixmap::convertToImage() const
             qt_XShmDestroyImage( xi, &shminfo );
         else
 #endif
-            qSafeXDestroyImage( xi );
+	qSafeXDestroyImage( xi );
+	((TQPixmap*)this)->data->ximage = 0;
 	return image;
     }
 
-- 
cgit v1.2.1