From 9a41f048677c16d1fa4e1fc09a27f6e030bb00a5 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Thu, 4 Jul 2013 22:51:39 +0200 Subject: [PATCH] COsdSetup: Fix segfault due 'double free or corruption' (glibc) - remove 'delete mfFontFile' & 'delete mfTtxFontFile' from destructor - initialize variables mfFontFile & mfTtxFontFile Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/dfd5c29371024ac600a7ccfbe92ca1bec756750c Author: Michael Liebmann Date: 2013-07-04 (Thu, 04 Jul 2013) --- src/gui/osd_setup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index d66e92d80..4c7b70c31 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -70,6 +70,8 @@ COsdSetup::COsdSetup(bool wizard_mode) fontsizenotifier = new CFontSizeNotifier; osd_menu = NULL; submenu_menus = NULL; + mfFontFile = NULL; + mfTtxFontFile = NULL; is_wizard = wizard_mode; @@ -82,8 +84,6 @@ COsdSetup::~COsdSetup() { delete colorSetupNotifier; delete fontsizenotifier; - delete mfFontFile; - delete mfTtxFontFile; } //font settings