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

[Caolán McNamara (via logerrit)]

 chart2/source/model/main/DataSeries.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 06b34d9f4b7967e87cd53e0effd98bfacfee2bb9
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Mar 29 11:25:05 2023 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Mar 29 12:32:27 2023 +0000

    crashtesting: Null-deref on export of forum-mso-en4-274729.xls to ods
    
    and others, probably since:
    
    commit f02ec0d8489404966596cb0e949bf969e8e66fa2
    Date:   Wed Mar 22 08:50:15 2023 +0200
    
        move hasUnhiddenData inside chart2::DataSeries
    
    Change-Id: Icf59439f00a40ef036decaa36f3d5af68787c864
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149688
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/chart2/source/model/main/DataSeries.cxx 
b/chart2/source/model/main/DataSeries.cxx
index 9f863f888dd0..9008ab8e664b 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -686,6 +686,8 @@ OUString DataSeries::getLabelForRole( const OUString & 
rLabelSequenceRole )
 
 static bool lcl_SequenceHasUnhiddenData( const uno::Reference< 
chart2::data::XDataSequence >& xDataSequence )
 {
+    if (!xDataSequence.is())
+        return false;
     uno::Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY 
);
     if( xProp.is() )
     {