fix undefined behavior with out-of-bounds substring access

Change-Id: Ie40d3dd2947d41b62eae84f20cfe457d69cc4bfe
This commit is contained in:
Markus Mohrhard
2013-09-29 16:27:58 +02:00
parent 383622a30d
commit e880a88834

View File

@@ -220,9 +220,13 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u
} }
else else
{ {
sal_Int32 nThisIndex = pEntry->GetName().copy( aUser.getLength() ).toInt32(); OUString aEntryName = pEntry->GetName();
if( nThisIndex >= nUserIndex ) if(aEntryName.getLength() >= aUser.getLength())
nUserIndex = nThisIndex + 1; {
sal_Int32 nThisIndex = aEntryName.copy( aUser.getLength() ).toInt32();
if( nThisIndex >= nUserIndex )
nUserIndex = nThisIndex + 1;
}
} }
} }
} }