Set null after unregistering mainloop to fix heap-use-after-free

Change-Id: I7679ee06fd20e03b5a76f54c7a7c0b586439c2bd
(cherry picked from commit 4450f2d1b5476cee353177898ae569cba1758065)

diff --git a/packaging/murphy.spec b/packaging/murphy.spec
index 6949b37e6c52fb63c31e3e5199362556a42d0821..7708bea652917e897dc87d24e77c58d0214c9aa9 100644 (file)
--- a/packaging/murphy.spec
+++ b/packaging/murphy.spec
@@ -29,7 +29,7 @@
 Summary: Resource policy framework
 Name: murphy
 Version: 0.0.75
-Release: 18
+Release: 19
 License: BSD-3-Clause
 Group: System/Service
 URL: http://01.org/murphy/

diff --git a/src/common/qt-glue.cpp b/src/common/qt-glue.cpp
index 8fbf6360f4b4916742b2ba4467ed4541a413945a..5ac8f16f9d9b1b1db98680b5f7e3f5f84e0b0537 100644 (file)
--- a/src/common/qt-glue.cpp
+++ b/src/common/qt-glue.cpp
@@ -363,9 +363,12 @@ static void unregister(void *glue_data)
 {
     QtGlue *qt_glue = (QtGlue *)glue_data;
 
-    mrp_debug("unregistering mainloop");
+    mrp_debug("unregistering mainloop [%p]", qt_glue);
 
-    delete qt_glue;
+    if (qt_glue) {
+        delete qt_glue;
+        qt_glue = NULL;
+    }
 }