From 29215a710512f2742b708044bbfaa9eaf4338a31 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 23 Apr 2005 12:29:44 +0000 Subject: [PATCH 1/1] check for NULL pointer in OnMeasureItem() as well as in OnDrawItem() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/window.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 1193761843..d3f219b845 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -3607,7 +3607,11 @@ wxWindowMSW::MSWOnDrawItem(int WXUNUSED_UNLESS_ODRAWN(id), { wxMenuItem *pMenuItem = (wxMenuItem *)(pDrawStruct->itemData); - wxCHECK_MSG( pMenuItem && pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), + // see comment before the same test in MSWOnMeasureItem() below + if ( !pMenuItem ) + return false; + + wxCHECK_MSG( wxDynamicCast(pMenuItem, wxMenuItem), false, _T("MSWOnDrawItem: bad wxMenuItem pointer") ); // prepare to call OnDrawItem(): notice using of wxDCTemp to prevent -- 2.47.2