Commit 503c8230 authored Oct 03, 2013 by Martin Walch Committed by Yann E. MORIN Oct 08, 2013

kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len

The struct gstr has a capacity that may differ from the actual string length.

However, a string manipulation in the function search_conf made the assumption
that it is the same, which led to messing up some search results, especially
when the content of the gstr in use had not yet reached at least 63 chars.

Signed-off-by: Martin Walch <walch.martin@web.de>
Acked-by: Wang YanQing <udknight@gmail.com>
Acked-by: Benjamin Poirier <bpoirier@suse.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

parent 33819600

scripts/kconfig/menu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -584,7 +584,7 @@ static void get_prompt_str(struct gstr r, struct property prop,
		for (j = 4; --i >= 0; j += 2) {
		menu = submenu[i];
		if (head && location && menu == location)
		jump->offset = r->len - 1;
		jump->offset = strlen(r->s);
		str_printf(r, "%*c-> %s", j, ' ',
		_(menu_get_prompt(menu)));
		if (menu->sym) {