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 (returning 0), better error reporting in debug builds

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

15
src/mac/carbon/utils.cpp
View File

@@ -1909,9 +1909,20 @@ unsigned int wxMacDataItemBrowserControl::GetLineFromItem(const wxMacDataItem* i
wxMacDataItem* wxMacDataItemBrowserControl::GetItemFromLine(unsigned int n) const wxMacDataItem* wxMacDataItemBrowserControl::GetItemFromLine(unsigned int n) const
{ {
DataBrowserItemID id; DataBrowserItemID id = 0;
OSStatus err = GetItemID( (DataBrowserTableViewRowIndex) n , &id); OSStatus err = GetItemID( (DataBrowserTableViewRowIndex) n , &id);
wxASSERT( err == noErr); if ( err )
{
unsigned int count = MacGetCount();
if ( n >= count )
{
wxASSERT_MSG( n < count, wxString::Format(wxT("wxMacDataItemBrowserControl::GetItemFromLine: line index %d (zero based) out of bounds [0,%d]"), n, count-1 ) );
}
else
{
wxASSERT_MSG( err == noErr, wxString::Format(wxT("wxMacDataItemBrowserControl::GetItemFromLine GetItemId returned %d"), err ));
}
}
return (wxMacDataItem*) id; return (wxMacDataItem*) id;
} }