From b520eeab166427bcd495d3f796977c6c99a738d6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 2 Mar 2014 15:51:28 +0000 Subject: [PATCH] Don't crash in wxOSX wxDataViewChoiceRenderer if selection was cancelled. Check for the index validity and ignore the value of -1 as it is passed if the selection in the popup was cancelled. Closes #16017. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/dataview.mm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index e9df8f2063..56285283b7 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -2876,8 +2876,19 @@ wxDataViewChoiceRenderer::OSXOnCellChanged(NSObject *value, { // At least under OS X 10.7 we get the index of the item selected and not // its string. + const long choiceIndex = ObjectToLong(value); + + // We can receive -1 if the selection was cancelled, just ignore it. + if ( choiceIndex == -1 ) + return; + + // If it's not -1, it must be valid, but avoid crashing in GetChoice() + // below if it isn't, for some reason. + wxCHECK_RET( choiceIndex >= 0 && (size_t)choiceIndex < GetChoices().size(), + wxS("Choice index out of range.") ); + wxDataViewModel *model = GetOwner()->GetOwner()->GetModel(); - model->ChangeValue(GetChoice(ObjectToLong(value)), item, col); + model->ChangeValue(GetChoice(choiceIndex), item, col); } bool wxDataViewChoiceRenderer::MacRender()