[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 72b9756c1ef1cc5258fc124a9e0b2c2b8d522872
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Dec 2 15:32:06 2017 +0100

    ofz#4484 another stab at mnRangeOpPosInSymbol
    
    Commit cd0b749cc4b4f268d26639fb3c6cbf2128b2d7df still missed it by
    one position behind string length.
    
    Also move the check to end of i18n symbol parsing for all
    constellations.
    
    Change-Id: I7b5e1375fe711dcc3f659e558702de78893d25a5
    Reviewed-on: https://gerrit.libreoffice.org/45718
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index dce7841b80cd..8f74f42276a4 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2672,9 +2672,9 @@ Label_MaskStateMachine:
         {
             SetError( FormulaError::StringOverflow );
             nLen = MAXSTRLEN;
-            if (mnRangeOpPosInSymbol > nLen)
-                mnRangeOpPosInSymbol = -1;
         }
+        if (mnRangeOpPosInSymbol >= nLen)
+            mnRangeOpPosInSymbol = -1;
         lcl_UnicodeStrNCpy( cSymbol, aSymbol.getStr(), nLen );
         pSym = &cSymbol[nLen];
     }