svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 97f41621580d884f59175964dd41898c3a9f9a23
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Feb 21 12:17:26 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Feb 21 18:47:05 2022 +0100
cid#1500477 silence Explicit null dereferenced
Change-Id: Ic57c49ce1c65ecca4e87be970e76bf16ba234711
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130273
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 acbcd00d5f73..7ec09e455d90 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -864,6 +864,8 @@ public:
std::shared_ptr<ExpressionNode> pFirstArg( std::move(rNodeStack.top())
);
rNodeStack.pop();
+ assert(pSecondArg && pFirstArg && "count of arg checked before we get
here");
+
// create combined ExpressionNode
auto pNode = std::make_shared<BinaryFunctionExpression>( meFunct,
pFirstArg, pSecondArg );
// check for constness
