follow on fix for fdo#62090 ensure out of range startpos is handled

Change-Id: Ic1f57480a36415998748faeea3b606a47d277181

follow on fix for fdo#62090 ensure out of range startpos is handled
Change-Id: Ic1f57480a36415998748faeea3b606a47d277181
0054b438 · Noel Power · 205277f5 · 0054b438
Kaydet (Commit) 0054b438 authored Mar 19, 2013 tarafından Noel Power
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

methods.cxx basic/source/runtime/methods.cxx +6 -2

No files found.
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1265,8 +1265,12 @@ RTLFUNC(Mid)
                else
                {
                    aResultStr = aArgStr;
-                    aResultStr.remove( nStartPos, nLen );
-                    aResultStr.insert( nStartPos, rPar.Get(4)->GetOUString().getStr(), std::min(nLen, rPar.Get(4)->GetOUString().getLength()));
+                    sal_Int32 nTmpStartPos = nStartPos;
+                    if ( nTmpStartPos > aArgStr.getLength() )
+                        nTmpStartPos =  aArgStr.getLength();
+                    else
+                        aResultStr.remove( nTmpStartPos, nLen );
+                    aResultStr.insert( nTmpStartPos, rPar.Get(4)->GetOUString().getStr(), std::min(nLen, rPar.Get(4)->GetOUString().getLength()));
                }

                rPar.Get(1)->PutString( aResultStr.makeStringAndClear() );