Fix rubbish context leads to crash

m-kuhn · m-kuhn · commit 8c85b7392cd8 · 2018-09-30T14:26:33.000+02:00
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp b/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp
@@ -29,8 +29,9 @@
 
 
 
-QgsGeometryChecker::QgsGeometryChecker( const QList<QgsGeometryCheck *> &checks, const QMap<QString, QgsFeaturePool *> &featurePools )
+QgsGeometryChecker::QgsGeometryChecker( const QList<QgsGeometryCheck *> &checks, QgsGeometryCheckContext *context, const QMap<QString, QgsFeaturePool *> &featurePools )
   : mChecks( checks )
+  , mContext( context )
   , mFeaturePools( featurePools )
 {
   for ( auto it = featurePools.constBegin(); it != mFeaturePools.constEnd(); ++it )
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrychecker.h b/src/analysis/vector/geometry_checker/qgsgeometrychecker.h
@@ -41,7 +41,7 @@ class ANALYSIS_EXPORT QgsGeometryChecker : public QObject
 {
     Q_OBJECT
   public:
-    QgsGeometryChecker( const QList<QgsGeometryCheck *> &checks, const QMap<QString, QgsFeaturePool *> &featurePools );
+    QgsGeometryChecker( const QList<QgsGeometryCheck *> &checks, QgsGeometryCheckContext *context SIP_TRANSFER, const QMap<QString, QgsFeaturePool *> &featurePools );
     ~QgsGeometryChecker() override;
     QFuture<void> execute( int *totalSteps = nullptr );
     bool fixError( QgsGeometryCheckError *error, int method, bool triggerRepaint = false );
@@ -67,7 +67,7 @@ class ANALYSIS_EXPORT QgsGeometryChecker : public QObject
     };
 
     QList<QgsGeometryCheck *> mChecks;
-    QgsGeometryCheckContext *mContext;
+    QgsGeometryCheckContext *mContext = nullptr;
     QList<QgsGeometryCheckError *> mCheckErrors;
     QStringList mMessages;
     QMutex mErrorListMutex;
diff --git a/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp
@@ -437,7 +437,7 @@ void QgsGeometryCheckerSetupTab::runChecks()
       checks.append( check );
     }
   }
-  QgsGeometryChecker *checker = new QgsGeometryChecker( checks, featurePools );
+  QgsGeometryChecker *checker = new QgsGeometryChecker( checks, context, featurePools );
 
   emit checkerStarted( checker );
 

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,9 @@`
`29`	`29`
`30`	`30`
`31`	`31`
`32`		`-QgsGeometryChecker::QgsGeometryChecker( const QList<QgsGeometryCheck > &checks, const QMap<QString, QgsFeaturePool > &featurePools )`
	`32`	`+QgsGeometryChecker::QgsGeometryChecker( const QList<QgsGeometryCheck > &checks, QgsGeometryCheckContext context, const QMap<QString, QgsFeaturePool *> &featurePools )`
`33`	`33`	`: mChecks( checks )`
	`34`	`+ , mContext( context )`
`34`	`35`	`, mFeaturePools( featurePools )`
`35`	`36`	`{`
`36`	`37`	`for ( auto it = featurePools.constBegin(); it != mFeaturePools.constEnd(); ++it )`
Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ void QgsGeometryCheckerSetupTab::runChecks()`
`437`	`437`	`checks.append( check );`
`438`	`438`	`}`
`439`	`439`	`}`
`440`		`- QgsGeometryChecker *checker = new QgsGeometryChecker( checks, featurePools );`
	`440`	`+ QgsGeometryChecker *checker = new QgsGeometryChecker( checks, context, featurePools );`
`441`	`441`
`442`	`442`	`emit checkerStarted( checker );`
`443`	`443`