Check for NULL before dereferencing

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif/bitmap.cpp b/src/motif/bitmap.cpp
index 9e5d80983ef44a4038a7e573c4d64010653dad77..fe00dc46faae2fe655e743a57c7137e10ae401bb 100644 (file)
--- a/src/motif/bitmap.cpp
+++ b/src/motif/bitmap.cpp
@@ -829,6 +829,8 @@ void wxBitmap::InitStandardHandlers()
 
 WXPixmap wxBitmap::GetLabelPixmap (WXWidget w)
 {
 
 WXPixmap wxBitmap::GetLabelPixmap (WXWidget w)
 {

+    if (!M_BITMAPDATA)
+        return (WXPixmap)NULL;

     if (M_BITMAPDATA->m_image == (WXPixmap) 0)
         return M_BITMAPDATA->m_pixmap;
 
     if (M_BITMAPDATA->m_image == (WXPixmap) 0)
         return M_BITMAPDATA->m_pixmap;
 


@@ -905,7 +907,9 @@ WXPixmap wxBitmap::GetArmPixmap (WXWidget w)
 WXPixmap wxBitmap::GetInsensPixmap (WXWidget w)
 {
     Display *dpy = (Display*) M_BITMAPDATA->m_display;
 WXPixmap wxBitmap::GetInsensPixmap (WXWidget w)
 {
     Display *dpy = (Display*) M_BITMAPDATA->m_display;

-
+    
+    if (!M_BITMAPDATA)
+        return (WXPixmap)NULL;

     if (M_BITMAPDATA->m_insensPixmap)
         return M_BITMAPDATA->m_insensPixmap;
 
     if (M_BITMAPDATA->m_insensPixmap)
         return M_BITMAPDATA->m_insensPixmap;