[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/unoobj/chart2uno.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0aa3c2b165e740cfa669a16808ab19c67556b77f
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Dec 11 21:26:01 2022 +0000
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Dec 13 10:49:56 2022 +0000

    crashtesting: use of uninitialized data in forum-mso-en4-93354.xls
    
    Change-Id: I678a22289827e0a9c305ac49f7f046ae2a91184c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143956
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Tested-by: Jenkins

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 5beaf2f55ad6..8de29306e578 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -534,7 +534,14 @@ void Chart2Positioner::glueState()
     }
 
     ScComplexRefData aData;
-    ScRefTokenHelper::getDoubleRefDataFromToken(aData, mrRefTokens.front());
+    if (!ScRefTokenHelper::getDoubleRefDataFromToken(aData, 
mrRefTokens.front()))
+    {
+        SAL_WARN("sc", "Chart2Positioner::glueState getDoubleRefDataFromToken 
failed");
+        invalidateGlue();
+        mnStartCol = 0;
+        mnStartRow = 0;
+        return;
+    }
     mnStartCol = aData.Ref1.Col();
     mnStartRow = aData.Ref1.Row();