Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guarding against crashes because of out-of-bounds accesses in release mode

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-05-29 09:53:59 +00:00
parent 1a4dea22ec
commit 28387bbc2d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/listctrl_mac.cpp
View File

@@ -3177,7 +3177,7 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign
{ {
wxMacDataItem* dataItem = GetItemFromLine(row); wxMacDataItem* dataItem = GetItemFromLine(row);
wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem for row in MacSetColumnInfo. Is row a valid wxListCtrl row?") ); wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem for row in MacSetColumnInfo. Is row a valid wxListCtrl row?") );
if (item) if (dataItem && item)
{ {
wxMacListCtrlItem* listItem = wx_static_cast(wxMacListCtrlItem*,dataItem); wxMacListCtrlItem* listItem = wx_static_cast(wxMacListCtrlItem*,dataItem);
bool hasInfo = listItem->HasColumnInfo( column ); bool hasInfo = listItem->HasColumnInfo( column );
@@ -3220,7 +3220,7 @@ void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsign
wxMacDataItem* dataItem = GetItemFromLine(row); wxMacDataItem* dataItem = GetItemFromLine(row);
wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem in MacGetColumnInfo. Is row a valid wxListCtrl row?") ); wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem in MacGetColumnInfo. Is row a valid wxListCtrl row?") );
// CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate // CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate
//if (item) if (dataItem)
{ {
wxMacListCtrlItem* listItem =wx_static_cast(wxMacListCtrlItem*,dataItem); wxMacListCtrlItem* listItem =wx_static_cast(wxMacListCtrlItem*,dataItem);