From 1c2c26279c864adb131e0978556b2cfdc9ecabac Mon Sep 17 00:00:00 2001 From: Martin Walch Date: Thu, 3 Oct 2013 18:35:16 +0200 Subject: kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len commit 503c823048e81cc85c0e9d8c297cc70203e335e5 upstream. 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 Acked-by: Wang YanQing Acked-by: Benjamin Poirier Reviewed-by: "Yann E. MORIN" Signed-off-by: "Yann E. MORIN" Signed-off-by: Jiri Slaby --- scripts/kconfig/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index c1d53200c306..2b3317010ba4 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -583,7 +583,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) { -- cgit v1.2.3