svl/source/numbers/zforscan.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 592ee0308a36518137ab8ed965f28de4600909da
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 6 09:20:53 2015 +0100
a malformed string here can force an out of bounds indexOf
Change-Id: Ic4d922bd27b7f119a7f8b95bbb4d4ed9e89fe51d
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ba94239..b539782 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
