Merge pull request #43133 from rouault/qgsappmaptools_double_free

QgsAppMapTools: fix double-free during destruction of tools
qgis · May 8, 2021 · 4ee22a7 · 4ee22a7
2 parents 9c868db + f7c093d
commit 4ee22a7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/app/qgsmaptooladdcircle.h b/src/app/qgsmaptooladdcircle.h
@@ -53,7 +53,7 @@ class APP_EXPORT QgsMapToolAddCircle: public QgsMapToolCapture
      * The parent map tool, e.g. the add feature tool.
      * Completed circle will be added to this tool by calling its addCurve() method.
      */
-    QgsMapToolCapture *mParentTool = nullptr;
+    QPointer<QgsMapToolCapture> mParentTool;
     //! Circle points (in map coordinates)
     QgsPointSequence mPoints;
     //! The rubberband to show the circular string currently working on

diff --git a/src/app/qgsmaptooladdcircularstring.h b/src/app/qgsmaptooladdcircularstring.h
@@ -51,7 +51,7 @@ class APP_EXPORT QgsMapToolAddCircularString: public QgsMapToolCapture
      * The parent map tool, e.g. the add feature tool.
      *  Completed circular strings will be added to this tool by calling its addCurve() method.
      */
-    QgsMapToolCapture *mParentTool = nullptr;
+    QPointer<QgsMapToolCapture> mParentTool;
     //! Circular string points (in map coordinates)
     QgsPointSequence mPoints;
     //! The rubberband to show the already completed circular strings

diff --git a/src/app/qgsmaptooladdellipse.h b/src/app/qgsmaptooladdellipse.h
@@ -49,7 +49,7 @@ class APP_EXPORT QgsMapToolAddEllipse: public QgsMapToolCapture
      * The parent map tool, e.g. the add feature tool.
      * Completed ellipse will be added to this tool by calling its toLineString() method.
      */
-    QgsMapToolCapture *mParentTool = nullptr;
+    QPointer<QgsMapToolCapture> mParentTool;
     //! Ellipse points (in map coordinates)
     QgsPointSequence mPoints;
     //! The rubberband to show the ellipse currently working on

diff --git a/src/app/qgsmaptooladdrectangle.h b/src/app/qgsmaptooladdrectangle.h
@@ -50,7 +50,7 @@ class APP_EXPORT QgsMapToolAddRectangle: public QgsMapToolCapture
      * The parent map tool, e.g. the add feature tool.
      * Completed regular shape will be added to this tool by calling its addCurve() method.
      */
-    QgsMapToolCapture *mParentTool = nullptr;
+    QPointer<QgsMapToolCapture> mParentTool;
     //! Regular Shape points (in map coordinates)
     QgsPointSequence mPoints;
     //! The rubberband to show the rectangle currently working on

diff --git a/src/app/qgsmaptooladdregularpolygon.h b/src/app/qgsmaptooladdregularpolygon.h
@@ -58,7 +58,7 @@ class APP_EXPORT QgsMapToolAddRegularPolygon: public QgsMapToolCapture
      * The parent map tool, e.g. the add feature tool.
      * Completed regular polygon will be added to this tool by calling its addCurve() method.
      */
-    QgsMapToolCapture *mParentTool = nullptr;
+    QPointer<QgsMapToolCapture> mParentTool;
     //! Regular Shape points (in map coordinates)
     QgsPointSequence mPoints;
     //! The rubberband to show the regular polygon currently working on