lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] qconf: (re)fix SIGSEGV on empty menu items

Browse Source 
Back out the recent fix for this bug, fix it by correctly initialising
ConfigInfoView.sym.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Cc: "Cyrill V. Gorcunov" <gorcunov@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Roman Zippel
2007-01-10 23:15:31 -08:00
committed by Linus Torvalds
parent a2f3aa0257
commit 6fa1da8ea9
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/kconfig/qconf.cc
View File

@@ -917,7 +917,7 @@ void ConfigView::updateListAll(void)
} }
ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name) ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)
: Parent(parent, name), menu(0) : Parent(parent, name), menu(0), sym(0)
{ {
if (name) { if (name) {
configSettings->beginGroup(name); configSettings->beginGroup(name);
@@ -925,8 +925,6 @@ ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)
configSettings->endGroup(); configSettings->endGroup();
connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings())); connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings()));
} }
has_dbg_info = 0;
} }
void ConfigInfoView::saveSettings(void) void ConfigInfoView::saveSettings(void)
@@ -955,13 +953,11 @@ void ConfigInfoView::setInfo(struct menu *m)
if (menu == m) if (menu == m)
return; return;
menu = m; menu = m;
if (!menu) { sym = NULL;
has_dbg_info = 0; if (!menu)
clear(); clear();
} else { else
has_dbg_info = 1;
menuInfo(); menuInfo();
}
} }
void ConfigInfoView::setSource(const QString& name) void ConfigInfoView::setSource(const QString& name)
@@ -996,9 +992,6 @@ void ConfigInfoView::symbolInfo(void)
{ {
QString str; QString str;
if (!has_dbg_info)
return;
str += "<big>Symbol: <b>"; str += "<big>Symbol: <b>";
str += print_filter(sym->name); str += print_filter(sym->name);
str += "</b></big><br><br>value: "; str += "</b></big><br><br>value: ";

2
scripts/kconfig/qconf.h
View File

@@ -273,8 +273,6 @@ protected:
struct symbol *sym; struct symbol *sym;
struct menu *menu; struct menu *menu;
bool _showDebug; bool _showDebug;
int has_dbg_info;
}; };
class ConfigSearchWindow : public QDialog { class ConfigSearchWindow : public QDialog {