core.git: Branch 'libreoffice-24-8' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/filter/xml/xmlcelli.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 7d7d3afcf6ac45111e3a023e88d68ab27fcd2409
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Nov 21 14:49:59 2024 +0000
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Nov 22 10:42:09 2024 +0100

    ofz#380107559 fods2xlsfuzzer Null-dereference READ
    
    in SvXMLStylesContext::FindStyleChildContext
    
    Change-Id: I384e8e36bc23b7d84b7ccda34e1ee29109e5f708
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176942
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit b2e60fb56e8f8f0b99fdaf3162034db19a80fd7b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176986
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index ae02df190371..045851b680ea 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -843,10 +843,11 @@ void ScXMLTableRowCellContext::SetAnnotation(const 
ScAddress& rPos)
 
         /*  Don't attempt to get the style from the SdrObject,
             as it might be a default assigned one. */
-        auto pStyle = 
rXMLImport.GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(
-            XmlStyleFamily::SD_GRAPHICS_ID, mxAnnotationData->maStyleName);
+        const SvXMLStylesContext* pStylesCtxt = 
rXMLImport.GetShapeImport()->GetAutoStylesContext();
+        const SvXMLStyleContext* pStyle = pStylesCtxt ? 
pStylesCtxt->FindStyleChildContext(
+            XmlStyleFamily::SD_GRAPHICS_ID, mxAnnotationData->maStyleName) : 
nullptr;
         OUString aStyleName = pStyle ? pStyle->GetParentName() : 
mxAnnotationData->maStyleName;
-        
assert(!rXMLImport.GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(
+        assert(!pStylesCtxt || !pStylesCtxt->FindStyleChildContext(
             XmlStyleFamily::SD_GRAPHICS_ID, aStyleName));
         aStyleName = 
rXMLImport.GetStyleDisplayName(XmlStyleFamily::SD_GRAPHICS_ID, aStyleName);