From df4b1b9be4f818ef912bfb58b514bab1acdd6e71 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Tue, 19 Mar 2013 15:59:21 +0000 Subject: follow on fix for fdo#62090 ensure out of range startpos is handled Change-Id: Ic1f57480a36415998748faeea3b606a47d277181 (cherry picked from commit 0054b438013ef412c2df3b7ebe93dd1935ec07af) Reviewed-on: https://gerrit.libreoffice.org/3409 Reviewed-by: Petr Mladek Tested-by: Petr Mladek --- basic/source/runtime/methods.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 7f724b1b6810..666dbbad012d 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -1261,8 +1261,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() ); -- cgit