Expressions: test prepare() and fix segfault

qgis · Dec 25, 2015 · d746a94 · d746a94
1 parent 5f1959b
commit d746a94
Show file tree

Hide file tree

Showing 2 changed files with 5 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 ? mElseExp->clone() : nullptr );
 }
 
 

diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -770,6 +770,10 @@ class TestQgsExpression: public QObject
       //qDebug() << "type " << res.typeName();
       QCOMPARE( exp.hasEvalError(), evalError );
 
+      QgsExpressionContext context;
+
+      Q_ASSERT( exp.prepare( &context ) );
+
       QCOMPARE( result.type(), expected.type() );
       switch ( result.type() )
       {