fix undefined behavior with out-of-bounds substring access

Change-Id: Ie40d3dd2947d41b62eae84f20cfe457d69cc4bfe

fix undefined behavior with out-of-bounds substring access
Change-Id: Ie40d3dd2947d41b62eae84f20cfe457d69cc4bfe
e880a888 · Markus Mohrhard · 383622a3 · e880a888
Kaydet (Commit) e880a888 authored Eyl 29, 2013 tarafından Markus Mohrhard
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

xattr.cxx svx/source/xoutdev/xattr.cxx +7 -3

No files found.
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -220,9 +220,13 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u
                    }
                    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;
+                        }
                    }
                }
            }