leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kconfig: qconf: remove wrong ConfigList::firstChild()

Browse Source 
This function returns the first child object, but the returned pointer
is not compatible with (ConfigItem *).

Commit cc1c08edcc ("kconfig: qconf: don't show goback button on
splitMode") uncovered this issue because using the pointer from this
function would make qconf crash. (https://lkml.org/lkml/2020/7/18/411)

This function does not work. Remove.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada
2020-08-01 16:08:50 +09:00
parent 4b20e103a6
commit ccf56e5fe3
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/kconfig/qconf.cc
View File

@@ -434,7 +434,7 @@ void ConfigList::updateList(ConfigItem* item)
} }
if ((mode == singleMode || (mode == symbolMode && !(rootEntry->flags & MENU_ROOT))) && if ((mode == singleMode || (mode == symbolMode && !(rootEntry->flags & MENU_ROOT))) &&
rootEntry->sym && rootEntry->prompt) { rootEntry->sym && rootEntry->prompt) {
item = last ? last->nextSibling() : firstChild(); item = last ? last->nextSibling() : nullptr;
if (!item) if (!item)
item = new ConfigItem(this, last, rootEntry, true); item = new ConfigItem(this, last, rootEntry, true);
else else

4
scripts/kconfig/qconf.h
View File

@@ -92,10 +92,6 @@ public:
{ {
return this; return this;
} }
ConfigItem* firstChild() const
{
return (ConfigItem *)children().first();
}
void addColumn(colIdx idx) void addColumn(colIdx idx)
{ {
showColumn(idx); showColumn(idx);