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

[Caolán McNamara]

 starmath/source/parse.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit deba726824b751cdba7b13793e68ecc442168e7d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 15 09:50:05 2017 +0000

    ofz#4643 Direct-leak
    
    Change-Id: Ie4fff1a113916c7a3344959cfb4ee14c3fda2073
    Reviewed-on: https://gerrit.libreoffice.org/46512
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 57344e1c6ffe..9cc4feee9e7a 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1340,7 +1340,8 @@ SmNode *SmParser::DoTerm(bool bGroupNumberIdent)
                 return pNode.release();
             }
             auto pSNode = o3tl::make_unique<SmExpressionNode>(m_aCurToken);
-            pSNode->SetSubNodes(pNode.release(), DoError(SmParseError::RgroupExpected));
+            std::unique_ptr<SmNode> xError(DoError(SmParseError::RgroupExpected));
+            pSNode->SetSubNodes(pNode.release(), xError.release());
             return pSNode.release();
         }
 
@@ -1566,16 +1567,15 @@ SmOperNode *SmParser::DoOperator()
     auto pSNode = o3tl::make_unique<SmOperNode>(m_aCurToken);
 
     // get operator
-    SmNode *pOperator = DoOper();
+    std::unique_ptr<SmNode> xOperator(DoOper());
 
-    if ( m_aCurToken.nGroup == TG::Limit ||
-         m_aCurToken.nGroup == TG::Power )
-        pOperator = DoSubSup(m_aCurToken.nGroup, pOperator);
+    if (m_aCurToken.nGroup == TG::Limit || m_aCurToken.nGroup == TG::Power)
+        xOperator.reset(DoSubSup(m_aCurToken.nGroup, xOperator.release()));
 
     // get argument
-    SmNode *pArg = DoPower();
+    std::unique_ptr<SmNode> xArg(DoPower());
 
-    pSNode->SetSubNodes(pOperator, pArg);
+    pSNode->SetSubNodes(xOperator.release(), xArg.release());
     return pSNode.release();
 }