summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Versini <arnaud.versini@gmail.com>2014-06-15 20:08:26 +0200
committerCaolán McNamara <caolanm@redhat.com>2014-06-16 10:54:37 +0000
commit7eceffef49c9f498c5758d5e351c0f22126003e5 (patch)
tree5aec25bac3eab4aa3f8d10f1380c6ec8cbeb3743
parentbe0837fbc0c5bf49497d8fffc1e8e626942481b1 (diff)
Resolve fdo#79913 by checking index bounds
Change-Id: I023a625d73724332245d612a61cb786acefc4cf2 Reviewed-on: https://gerrit.libreoffice.org/9791 Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--svtools/source/control/toolbarmenu.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index d0f1e49ce9a0..2be0e430d8bb 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -397,7 +397,7 @@ void ToolbarMenu_Impl::notifyHighlightedEntry()
if( pValueSet )
nChildIndex = static_cast< sal_Int32 >( pValueSet->GetItemPos( pValueSet->GetSelectItemId() ) );
- if( nChildIndex >= pEntry->getAccessibleChildCount() )
+ if( (nChildIndex >= pEntry->getAccessibleChildCount()) || (nChildIndex < 0) )
return;
aNew <<= getAccessibleChild( pEntry->mpControl, nChildIndex );