Expressions, fix WhenThen crash and more tests

* Fix a crash with WhenThenList * Check implicit sharing with all test expressions.
qgis · Dec 24, 2015 · 4b72357 · 4b72357
1 parent 88a197b
commit 4b72357
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -4189,7 +4189,7 @@ QgsExpression::Node* QgsExpression::NodeCondition::clone() const
   WhenThenList conditions;
   Q_FOREACH ( WhenThen* wt, mConditions )
     conditions.append( new WhenThen( wt->mWhenExp->clone(), wt->mThenExp->clone() ) );
-  return new NodeCondition( &conditions, mElseExp->clone() );
+  return new NodeCondition( conditions, mElseExp->clone() );
 }
 
 

diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -966,6 +966,7 @@ class CORE_EXPORT QgsExpression
     {
       public:
         NodeCondition( WhenThenList* conditions, Node* elseExp = nullptr ) : mConditions( *conditions ), mElseExp( elseExp ) { delete conditions; }
+        NodeCondition( const WhenThenList& conditions, Node* elseExp = nullptr ) : mConditions( conditions ), mElseExp( elseExp ) {}
         ~NodeCondition() { delete mElseExp; qDeleteAll( mConditions ); }
 
         virtual NodeType nodeType() const override { return ntCondition; }

diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -827,6 +827,8 @@ class TestQgsExpression: public QObject
       run_evaluation_test( exp2, evalError, result );
       QgsExpression exp3( exp.expression() );
       run_evaluation_test( exp3, evalError, result );
+      QgsExpression exp4( exp );
+      run_evaluation_test( exp4, evalError, result );
     }
 
     void eval_precedence()