sc/source/ui/unoobj/docuno.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2cad06de3f7d9b6a6a9b4365badc40bcc9f24649
Author:     Aron Budea <aron.bu...@collabora.com>
AuthorDate: Sat Aug 24 23:53:55 2024 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Aug 27 11:19:20 2024 +0200

    sc: fix crash in ScModelObj::initializeForTiledRendering()
    
    Crashreport signature:
    
    > Fatal signal received: SIGSEGV code: 1 for address: 0xd2
    > program/libsclo.so
    >       ScDocShell::CalcOutputFactor()
    >               sc/source/ui/docshell/docsh3.cxx:382
    > program/libsclo.so
    >       
ScModelObj::initializeForTiledRendering(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>
 const&)
    >               sc/source/ui/unoobj/docuno.cxx:1346
    > program/libmergedlo.so
    >       doc_initializeForRendering
    >               include/com/sun/star/uno/Sequence.hxx:120
    > /usr/bin/coolforkit
    >       Document::load(std::shared_ptr<ChildSession> const&, std::string 
const&)
    >               bundled/include/LibreOfficeKit/LibreOfficeKit.hxx:578
    
    Change-Id: Id31229001951f4444781d173bf89d3e981f61b99
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172365
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit 4edf109f9ccc31c3daa880df91bcb81c55ff6ede)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172412
    Tested-by: Jenkins

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index dce8f566f733..4853629bbac2 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1338,7 +1338,8 @@ void ScModelObj::initializeForTiledRendering(const 
css::uno::Sequence<css::beans
     aInputOptions.SetTextWysiwyg(true);
     aInputOptions.SetReplaceCellsWarn(false);
     SC_MOD()->SetInputOptions(aInputOptions);
-    pDocShell->CalcOutputFactor();
+    if (pDocShell)
+        pDocShell->CalcOutputFactor();
 
     // when the "This document may contain formatting or content that cannot
     // be saved..." dialog appears, it is auto-cancelled with tiled rendering,

Reply via email to