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

[Caolán McNamara (via logerrit)]

 sc/source/ui/undo/undodat.cxx                                 |    2 ++
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 5541b7b1dd0d683a7018f7499aec4dbe6626a25a
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Mar 4 15:22:45 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Mar 4 22:37:15 2022 +0100

    cid#1500546 silence Explicit null dereferenced
    
    Change-Id: I44b97965548bd84adf6dc3ec1c67f028a4b31075
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131000
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx 
b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 7ec09e455d90..f7aa223f4997 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -901,6 +901,8 @@ public:
         std::shared_ptr<ExpressionNode> pFirstArg( std::move(rNodeStack.top()) 
);
         rNodeStack.pop();
 
+        assert(pThirdArg && pSecondArg && pFirstArg);
+
         // create combined ExpressionNode
         auto pNode = std::make_shared<IfExpression>( pFirstArg, pSecondArg, 
pThirdArg );
         // check for constness
commit b35571c348eb8816098f7c8786d8cc8ff9082f19
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Mar 4 15:20:48 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Mar 4 22:36:58 2022 +0100

    cid#1500566 Uninitialized scalar field
    
    Change-Id: I63e81377227ab35a0697a1d90fb3c9302a12a2b5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130999
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 006527d7bacd..1ab89a8b543f 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -1707,6 +1707,8 @@ ScUndoChartData::ScUndoChartData( ScDocShell* 
pNewDocShell, const OUString& rNam
                                     bool bAdd ) :
     ScSimpleUndo( pNewDocShell ),
     aChartName( rName ),
+    bOldColHeaders(false),
+    bOldRowHeaders(false),
     aNewRangeListRef( rNew ),
     bNewColHeaders( bColHdr ),
     bNewRowHeaders( bRowHdr ),