From 29014baaa5124aa136d59de8f9f0a61f42c47dac Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 30 Mar 2007 13:39:24 +0000 Subject: [PATCH] added a check that we have a non-NULL scrollbar in wxScrollBarCallback() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/motif/scrolbar.cpp | 2 ++ src/motif/window.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp index 5b19681cf3..6cbdf29c23 100644 --- a/src/motif/scrolbar.cpp +++ b/src/motif/scrolbar.cpp @@ -125,6 +125,8 @@ static void wxScrollBarCallback(Widget widget, XtPointer clientData, XmScaleCallbackStruct *cbs) { wxScrollBar *scrollBar = (wxScrollBar*)wxGetWindowFromTable(widget); + wxCHECK_RET( scrollBar, _T("invalid widget in scrollbar callback") ); + wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData); wxEventType eventType = wxEVT_NULL; diff --git a/src/motif/window.cpp b/src/motif/window.cpp index 66428802a9..a99a8bb706 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -2088,6 +2088,8 @@ static void wxScrollBarCallback(Widget scrollbar, XmScrollBarCallbackStruct *cbs) { wxWindow *win = wxGetWindowFromTable(scrollbar); + wxCHECK_RET( win, _T("invalid widget in scrollbar callback") ); + wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData); wxEventType eventType = wxEVT_NULL; -- 2.45.2