summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Bainbridge <chris.bainbridge@gmail.com>2016-01-08 20:44:04 (GMT)
committerMichal Marek <mmarek@suse.com>2016-01-11 08:45:08 (GMT)
commit5b61c7bd25f13daa58f2507991e87e990d7c6010 (patch)
treecdad5faee770e288b628e1761d8bd205383525c7
parentaab24a897cfba9dd371f6aac45dbcdae0b23def6 (diff)
downloadlinux-5b61c7bd25f13daa58f2507991e87e990d7c6010.tar.xz
kconfig: fix qconf segfault by deleting heap objects
On Debian stable (qt-4.8.6) 'make xconfig' intermittently fails due to qconf segfaulting at exit time in QXcbEventReader. The cause of this is destructors on the heap objects never being called, so fix this by properly deleting the heap objects before exit. Signed-off-by: Chris Bainbridge <chris.bainbridge@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.com>
-rw-r--r--scripts/kconfig/qconf.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 91b7e6f..fc55559 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1863,6 +1863,8 @@ int main(int ac, char** av)
configSettings->endGroup();
delete configSettings;
+ delete v;
+ delete configApp;
return 0;
}