summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2010-11-09 16:43:41 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2010-11-09 16:43:41 +0100
commit2c3ee5c72d40f9415b52cb0851dd328c254124f6 (patch)
tree8d4b0f97cec50cd9ece4be4129120f835a92a8b2
parent71a635b2648134b263d5eed30e60e1ab14ffe8da (diff)
vcl117: #i115493# check index for validity
-rw-r--r--cui/source/options/optcolor.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index ff10e2744533..bcc4dbf54dcb 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -945,12 +945,14 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
aColorBoxes[0]->SetHelpId( aColorLBHids[0] );
+ OSL_ENSURE( nCount < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])), "too few helpIDs for color listboxes" );
for( sal_Int32 i = 1; i < nCount; i++ )
{
if(aColorBoxes[i])
{
aColorBoxes[i]->CopyEntries( *aColorBoxes[0] );
- aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
+ if( i < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])) )
+ aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
}
}
}