Fixes #18435: QGIS crash when deleting auxiliary layer

slarosa · slarosa · commit 8aa7b56505f0 · 2018-03-14T14:52:51.000+01:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -4304,7 +4304,8 @@ void QgsVectorLayer::setAuxiliaryLayer( QgsAuxiliaryLayer *alayer )
   }
 
   mAuxiliaryLayer.reset( alayer );
-  mAuxiliaryLayer->setParent( this );
+  if ( mAuxiliaryLayer )
+    mAuxiliaryLayer->setParent( this );
   updateFields();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4304,7 +4304,8 @@ void QgsVectorLayer::setAuxiliaryLayer( QgsAuxiliaryLayer *alayer )`
`4304`	`4304`	`}`
`4305`	`4305`
`4306`	`4306`	`mAuxiliaryLayer.reset( alayer );`
`4307`		`- mAuxiliaryLayer->setParent( this );`
	`4307`	`+ if ( mAuxiliaryLayer )`
	`4308`	`+ mAuxiliaryLayer->setParent( this );`
`4308`	`4309`	`updateFields();`
`4309`	`4310`	`}`
`4310`	`4311`