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

Eike Rathke erack at redhat.com
Mon Dec 4 23:44:15 UTC 2017


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

New commits:
commit 9f2d4510cb98d1eefcba85db6edb7cf754b4519d
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Dec 4 20:17:22 2017 +0100

    assert(mnRangeOpPosInSymbol < MAXSTRLEN)
    
    We should survive that now..
    
    Change-Id: I4cadfa788bda470ee08958347671d843522669e8
    Reviewed-on: https://gerrit.libreoffice.org/45820
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 8f74f42276a4..909bf0afe1c7 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3268,8 +3268,9 @@ bool ScCompiler::IsReference( const OUString& rName, const OUString* pErrRef )
             return true;
         // Now try with a symbol up to the range operator, rewind source
         // position.
-        if (mnRangeOpPosInSymbol == MAXSTRLEN-1)
-            return false;
+        assert(mnRangeOpPosInSymbol < MAXSTRLEN);   // We should have caught the maldoers.
+        if (mnRangeOpPosInSymbol >= MAXSTRLEN)      // TODO: this check and return
+            return false;                           // can be removed when sure.
         sal_Int32 nLen = mnRangeOpPosInSymbol;
         while (cSymbol[++nLen])
             ;


More information about the Libreoffice-commits mailing list