[PATCH libreoffice-4-0] follow on fix for fdo#62090 ensure out of range startpos is ...
Noel Power (via Code Review)
gerrit at gerrit.libreoffice.org
Tue Apr 16 03:37:40 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3409
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/3409/1
follow on fix for fdo#62090 ensure out of range startpos is handled
Change-Id: Ic1f57480a36415998748faeea3b606a47d277181
(cherry picked from commit 0054b438013ef412c2df3b7ebe93dd1935ec07af)
---
M basic/source/runtime/methods.cxx
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 7f724b1..666dbba 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1261,8 +1261,12 @@
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() );
--
To view, visit https://gerrit.libreoffice.org/3409
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1f57480a36415998748faeea3b606a47d277181
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Noel Power <noel.power at suse.com>
More information about the LibreOffice
mailing list