summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-07-06 09:20:53 +0100
committerAndras Timar <andras.timar@collabora.com>2015-08-06 12:53:10 +0200
commitcff9a8c9cd1b226859bac4654d14df20265a2ff8 (patch)
treed99613cb8b25a6d23c7a7a3a2c3803635b330126 /svl
parent90bfc0aba0f7520ec00966a5c5f7cca0305a260c (diff)
a malformed string here can force an out of bounds indexOf
Change-Id: Ic4d922bd27b7f119a7f8b95bbb4d4ed9e89fe51d (cherry picked from commit 592ee0308a36518137ab8ed965f28de4600909da) Reviewed-on: https://gerrit.libreoffice.org/16787 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'svl')
-rw-r--r--svl/source/numbers/zforscan.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ba942391f668..b539782e0f49 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -889,7 +889,7 @@ sal_Int32 ImpSvNumberformatScan::Symbol_Division(const OUString& rString)
// Do we have some sort of currency?
OUString sString = pFormatter->GetCharClass()->uppercase(rString);
sal_Int32 nCPos = 0;
- while (nCPos >= 0)
+ while (nCPos >= 0 && nCPos < sString.getLength())
{
nCPos = sString.indexOf(GetCurString(),nCPos);
if (nCPos >= 0)