[Libreoffice-commits] core.git: svl/source

[Julien Nabet]

 svl/source/numbers/zforscan.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 53494630705692dec31587d746aa84d5d998c62f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Apr 7 22:48:58 2013 +0200

    Fix Array index "i" is used before limits check
    
    Change-Id: Ie7a4b836db7391f4e625bfeaeab55c2ed4304604

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 24bfde3..43a4bbc 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1474,8 +1474,8 @@ bool ImpSvNumberformatScan::InsertSymbol( sal_uInt16 & nPos, svt::NfSymbolType e
 int ImpSvNumberformatScan::FinalScanGetCalendar( sal_Int32& nPos, sal_uInt16& i,
                                                  sal_uInt16& rAnzResStrings )
 {
-    if ( sStrArray[i][0] == '[' &&
-         i < nAnzStrings-1 &&
+    if ( i < nAnzStrings-1 &&
+         sStrArray[i][0] == '[' &&
          nTypeArray[i+1] == NF_SYMBOLTYPE_STRING &&
          sStrArray[i+1][0] == '~' )
     {