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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 92e7bc1769c0cf0a0bca4e68a17cd52211e07414
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Dec 12 10:34:49 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Dec 12 16:00:44 2022 +0000

    crashtesting: null deref see on loading forum-mso-en4-531817.xlsx
    
    Change-Id: I8fb92edc32cabecd0f1ff5090f1b102e090aa840
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143983
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/filter/oox/pivottablebuffer.cxx 
b/sc/source/filter/oox/pivottablebuffer.cxx
index 3425c4a6c0c5..d57c17571282 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 )
                     {