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

[Caolán McNamara]

 basic/source/comp/exprtree.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a139320da2f28fe83145c9c9f33f2b3421fbc4c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 9 15:15:16 2016 +0000

    deref of null
    
    regression from
    
    commit f17a4694b07856292804c23b80ce92967d401bb8
    Author: Arnaud Versini <arnaud.versini at gmail.com>
    Date:   Sat Feb 13 20:17:41 2016 +0100
    
        BASIC : use std::unique_ptr for storing SbiExprList
    
        Change-Id: I37f2a1c837c6742cf6d403962d2730b5e80004ec
        Reviewed-on: https://gerrit.libreoffice.org/22345
    
    because they have been moved into the container at this
    point
    
    Change-Id: If21e0321ffdce66aa9629637d0ff8c16efbbd25e

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 8e3c441..bd509ad 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -234,8 +234,8 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
                 pvMoreParLcl = new SbiExprListVector();
             }
             SbiExprListPtr pAddPar = SbiExprList::ParseParameters( pParser );
-            pvMoreParLcl->push_back( std::move(pAddPar) );
             bError = bError || !pAddPar->IsValid();
+            pvMoreParLcl->push_back( std::move(pAddPar) );
             eTok = pParser->Peek();
         }
     }
@@ -432,8 +432,8 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
                 pvMoreParLcl = new SbiExprListVector();
             }
             SbiExprListPtr pAddPar = SbiExprList::ParseParameters( pParser );
-            pvMoreParLcl->push_back( std::move(pAddPar) );
             bError = bError || !pPar->IsValid();
+            pvMoreParLcl->push_back( std::move(pAddPar) );
             eTok = pParser->Peek();
         }
     }