Fix potential crash when preparing with_variable and no context is set

qgis · Aug 23, 2018 · c7eafc6 · c7eafc6
1 parent 6196fd3
commit c7eafc6
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -4941,9 +4941,19 @@ bool QgsWithVariableExpressionFunction::prepare( const QgsExpressionNodeFunction
   QVariant name = args->at( 0 )->prepare( parent, context );
   QVariant value = args->at( 1 )->prepare( parent, context );
 
-  appendTemporaryVariable( context, name.toString(), value );
-  args->at( 2 )->prepare( parent, context );
-  popTemporaryVariable( context );
+  QgsExpressionContext *updatedContext = const_cast<QgsExpressionContext *>( context );
+  std::unique_ptr< QgsExpressionContext > tempContext;
+  if ( !context )
+  {
+    tempContext = qgis::make_unique< QgsExpressionContext >();
+    updatedContext = tempContext.get();
+  }
+
+  appendTemporaryVariable( updatedContext, name.toString(), value );
+  args->at( 2 )->prepare( parent, updatedContext );
+
+  if ( context )
+    popTemporaryVariable( updatedContext );
 
   return true;
 }