mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix undefined behavior with out-of-bounds substring access

Browse Source 
Change-Id: Ie40d3dd2947d41b62eae84f20cfe457d69cc4bfe
This commit is contained in:
Markus Mohrhard
2013-09-29 16:27:58 +02:00
parent 383622a30d
commit e880a88834
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
svx/source/xoutdev/xattr.cxx
View File

@@ -220,13 +220,17 @@ 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(aEntryName.getLength() >= aUser.getLength())
{
sal_Int32 nThisIndex = aEntryName.copy( aUser.getLength() ).toInt32();
if( nThisIndex >= nUserIndex ) if( nThisIndex >= nUserIndex )
nUserIndex = nThisIndex + 1; nUserIndex = nThisIndex + 1;
} }
} }
} }
} }
}
if (aUniqueName.isEmpty() && pPool1) if (aUniqueName.isEmpty() && pPool1)
{ {