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

[Caolán McNamara]

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

New commits:
commit 547230e672e179539b2477ff36acb00076149f55
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 29 17:05:07 2017 +0000

    ofz#4484 don't set mnRangeOpPosInSymbol on StringOverflow case
    
    Change-Id: I35d86c97e4fb082a676a5eeadf8375738cecd7bd
    Reviewed-on: https://gerrit.libreoffice.org/45565
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 65780e5ad1e2..dce7841b80cd 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2214,14 +2214,16 @@ Label_MaskStateMachine:
                 {
                     // One range operator may form Sheet1.A:A, which we need to
                     // pass as one entity to IsReference().
-                    mnRangeOpPosInSymbol = pSym - &cSymbol[0];
                     if( pSym == &cSymbol[ MAXSTRLEN ] )
                     {
                         SetError(FormulaError::StringOverflow);
                         eState = ssStop;
                     }
                     else
+                    {
+                        mnRangeOpPosInSymbol = pSym - &cSymbol[0];
                         *pSym++ = c;
+                    }
                 }
                 else if ( 128 <= c || '\'' == c )
                 {   // High values need reparsing with i18n,