From 9322a44e08753a85d97fcd952677b1353926ead0 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 4 Mar 2010 15:24:20 +0000 Subject: [Bugfix] Don't crash in TXImage::updateColourMap function due NULL pointer dereference. Thanks to Jan Gorig for the patch. Main problem is that DesktopWindow::setColourMapEntries starts timer and after it expires it calls im->updateColourMap. During timer period format might be changed to full color thus "tig" pointer dereferenced in updateColourMap() becomes invalid. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4003 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- unix/tx/TXImage.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'unix') diff --git a/unix/tx/TXImage.cxx b/unix/tx/TXImage.cxx index 0a50791a..3e1a98e2 100644 --- a/unix/tx/TXImage.cxx +++ b/unix/tx/TXImage.cxx @@ -164,7 +164,8 @@ void TXImage::setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs) void TXImage::updateColourMap() { - tig->setColourMapEntries(0, 0, 0); + if (tig != 0) + tig->setColourMapEntries(0, 0, 0); } void TXImage::lookup(int index, int* r, int* g, int* b) -- cgit v1.2.3