Merge pull request #4991 from marioba/fix_processing_parameters

nyalldawson · web-flow · commit 37bc07a8d4c1 · 2017-08-07T07:07:39.000+10:00
Protect processing parameters from segfault
diff --git a/src/core/processing/qgsprocessingparameters.cpp b/src/core/processing/qgsprocessingparameters.cpp
@@ -391,7 +391,7 @@ QString QgsProcessingParameters::parameterAsOutputLayer( const QgsProcessingPara
   {
     dest = val.value< QgsProperty >().valueAsString( context.expressionContext(), definition->defaultValue().toString() );
   }
-  else if ( !val.isValid() || val.toString().isEmpty() )
+  else if ( definition && ( !val.isValid() || val.toString().isEmpty() ) )
   {
     // fall back to default
     dest = definition->defaultValue().toString();

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ QString QgsProcessingParameters::parameterAsOutputLayer( const QgsProcessingPara`
`391`	`391`	`{`
`392`	`392`	`dest = val.value< QgsProperty >().valueAsString( context.expressionContext(), definition->defaultValue().toString() );`
`393`	`393`	`}`
`394`		`- else if ( !val.isValid() \|\| val.toString().isEmpty() )`
	`394`	`+ else if ( definition && ( !val.isValid() \|\| val.toString().isEmpty() ) )`
`395`	`395`	`{`
`396`	`396`	`// fall back to default`
`397`	`397`	`dest = definition->defaultValue().toString();`