[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svl/source

[Caolán McNamara]

 svl/source/numbers/zformat.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b863a201c2a39751539e4a5d53897c41e67efec3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 7 12:05:46 2014 +0100

    fix crash on loading fdo70673-1.ods
    
    rStr is NaN
    
    Change-Id: I8206ab322a08d558cf5f05750efd700875b2134c
    (cherry picked from commit 12ec403c547cca4d7e5f73ae3ef58ff8faf3721e)
    Reviewed-on: https://gerrit.libreoffice.org/10109
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 262b686..ef94a23 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4364,7 +4364,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
                 const OUString& rStr = rInfo.sStrArray[j];
                 const sal_Unicode* p1 = rStr.getStr();
                 const sal_Unicode* p = p1 + rStr.getLength();
-                while ( p1 < p-- )
+                while (k && p1 < p--)
                 {
                     const sal_Unicode c = *p;
                     k--;