[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source

[Markus Mohrhard]

 sc/source/core/tool/interpr4.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 057889ab6daa159558f5a90bc03d987500d65b04
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Mar 13 12:45:07 2017 +0100

    tdf#106456, don't try to use invalid ranges in external ref code
    
    Reviewed-on: https://gerrit.libreoffice.org/35132
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 951fcc6556346e19a028443c70dea27d0cbc9c36)
    
    Backported.
    
    Change-Id: I38e622df87dd4b5e37dd248c5181978e13890fda
    Reviewed-on: https://gerrit.libreoffice.org/35188
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index fe3469c8f403..e76b45e097e6 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1307,6 +1307,12 @@ void ScInterpreter::GetExternalDoubleRef(
 
     ScComplexRefData aData(rData);
     ScRange aRange = aData.toAbs(aPos);
+    if (!ValidColRow(aRange.aStart.Col(), aRange.aStart.Row()) || !ValidColRow(aRange.aEnd.Col(), aRange.aEnd.Row()))
+    {
+        SetError(errNoRef);
+        return;
+    }
+
     ScExternalRefCache::TokenArrayRef pArray = pRefMgr->getDoubleRefTokens(
         nFileId, rTabName, aRange, &aPos);