summaryrefslogtreecommitdiffstats
path: root/src/kernel/qpixmap_x11.cpp
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-05-19 19:06:53 +0200
committerSlávek Banko <slavek.banko@axis.cz>2014-05-19 19:06:53 +0200
commitd5059601e64882a848f6e6730690c270c7b120c2 (patch)
tree58cb18bb5f40bea14d948d02444b634d839826a9 /src/kernel/qpixmap_x11.cpp
parenta9ec6a155692c862edda1799b48cb5cd9ce52e81 (diff)
downloadtqt3-d5059601e64882a848f6e6730690c270c7b120c2.tar.gz
tqt3-d5059601e64882a848f6e6730690c270c7b120c2.zip
Fix overwriting memory for an application icon
This resolves Bug 2033
Diffstat (limited to 'src/kernel/qpixmap_x11.cpp')
-rw-r--r--src/kernel/qpixmap_x11.cpp4
1 files changed, 3 insertions, 1 deletions
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;
}