summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorChris Bainbridge <chris.bainbridge@gmail.com>2016-01-08 20:44:04 +0000
committerMichal Marek <mmarek@suse.com>2016-01-11 09:45:08 +0100
commit5b61c7bd25f13daa58f2507991e87e990d7c6010 (patch)
treecdad5faee770e288b628e1761d8bd205383525c7 /scripts/kconfig
parentaab24a897cfba9dd371f6aac45dbcdae0b23def6 (diff)
downloadblackbird-op-linux-5b61c7bd25f13daa58f2507991e87e990d7c6010.tar.gz
blackbird-op-linux-5b61c7bd25f13daa58f2507991e87e990d7c6010.zip
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>
Diffstat (limited to 'scripts/kconfig')
-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 91b7e6fbc364..fc5555992220 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;
}
OpenPOWER on IntegriCloud