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

[Caolán McNamara (via logerrit)]

 sc/source/filter/oox/pivottablebuffer.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e7256105d956a1394112ebbb8a718a5126a804b5
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Dec 12 10:34:49 2022 +0000
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Dec 14 08:41:38 2022 +0000

    crashtesting: null deref see on loading forum-mso-en4-531817.xlsx
    
    Change-Id: I8fb92edc32cabecd0f1ff5090f1b102e090aa840
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143969
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sc/source/filter/oox/pivottablebuffer.cxx 
b/sc/source/filter/oox/pivottablebuffer.cxx
index 71ecbb49f947..3aadd5860264 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -755,8 +755,9 @@ Reference< XDataPilotField > 
PivotTableField::convertRowColPageField( sal_Int32
             {
                 ScDPSaveData* pSaveData = pDPObj->GetSaveData();
                 ScDPSaveDimension* pDim = 
pSaveData->GetDimensionByName(pCacheField->getName());
+                SAL_WARN_IF(!pDim, "sc.filter", 
"PivotTableField::convertRowColPageField - no Dimension found for: " << 
pCacheField->getName());
 
-                try
+                if (pDim) try
                 {
                     for( const auto& rItem : maItems )
                     {