redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[PATCH] qconf: fix SIGSEGV on empty menu items 

qconf may cause SIGSEGV by trying to show debug information on empty menu
items

Signed-off-by: Cyrill V. Gorcunov <gorcunov@gmail.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
wifi-calibration
Cyrill V. Gorcunov 2007-01-05 16:37:02 -08:00 committed by Linus Torvalds
parent f2e12bb272
commit 73b8ed29ab
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/kconfig/qconf.cc
View File

@ -925,6 +925,8 @@ 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)
@ -953,10 +955,13 @@ void ConfigInfoView::setInfo(struct menu *m)
if (menu == m) if (menu == m)
return; return;
menu = m; menu = m;
if (!menu) if (!menu) {
has_dbg_info = 0;
clear(); clear();
else } else {
has_dbg_info = 1;
menuInfo(); menuInfo();
}
} }
void ConfigInfoView::setSource(const QString& name) void ConfigInfoView::setSource(const QString& name)
@ -991,6 +996,9 @@ 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,6 +273,8 @@ 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 {