summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-03-19 15:59:21 +0000
committerNoel Power <noel.power@suse.com>2013-03-19 15:59:21 +0000
commit0054b438013ef412c2df3b7ebe93dd1935ec07af (patch)
treec159b1e8d77eb80099c8812b86dd975205451dbd /basic
parent205277f5e640492ce488a030b685f41cf2ef9442 (diff)
follow on fix for fdo#62090 ensure out of range startpos is handled
Change-Id: Ic1f57480a36415998748faeea3b606a47d277181
Diffstat (limited to 'basic')
-rw-r--r--basic/source/runtime/methods.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 12dfff2476a6..750d7c3da209 100644
--- 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() );