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

[Caolán McNamara (via logerrit)]

 slideshow/source/engine/smilfunctionparser.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 81b88be38651ae871f68f6a0425da56a12494ae2
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 24 10:04:31 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 24 15:33:16 2022 +0100

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

diff --git a/slideshow/source/engine/smilfunctionparser.cxx 
b/slideshow/source/engine/smilfunctionparser.cxx
index 3576393751ed..06a2b9639959 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -313,9 +313,11 @@ namespace slideshow::internal
                     // create combined ExpressionNode
                     std::shared_ptr<ExpressionNode> pNode( maGenerator( 
pFirstArg,
                                                                 pSecondArg ) );
+
+                    assert(pSecondArg && pFirstArg);
+
                     // check for constness
-                    if( pFirstArg->isConstant() &&
-                        pSecondArg->isConstant() )
+                    if (pFirstArg->isConstant() && pSecondArg->isConstant())
                     {
                         // call the operator() at pNode, store result
                         // in constant value ExpressionNode.