diff mbox

[v2,5/5] kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len

Message ID 2458916.eNjWPdyz4y@tacticalops (mailing list archive)
State New, archived
Headers show

Commit Message

Martin Walch Oct. 3, 2013, 5:25 p.m. UTC 
From: Martin Walch <walch.martin@web.de>
Date: Thu, 3 Oct 2013 18:35:16 +0200
Subject: [PATCH v2 5/5] 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>
---
 scripts/kconfig/menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

wang yanqing Oct. 5, 2013, 5:54 p.m. UTC | #1 
On Thu, Oct 03, 2013 at 07:25:53PM +0200, Martin Walch wrote:
> From: Martin Walch <walch.martin@web.de>
> Date: Thu, 3 Oct 2013 18:35:16 +0200
> Subject: [PATCH v2 5/5] 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>

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Benjamin Poirier Oct. 7, 2013, 1:43 p.m. UTC | #2 
On 2013/10/03 19:25, Martin Walch wrote:
> From: Martin Walch <walch.martin@web.de>
> Date: Thu, 3 Oct 2013 18:35:16 +0200
> Subject: [PATCH v2 5/5] kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len
> 

Good catch, thank you.

Acked-by: Benjamin Poirier <bpoirier@suse.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 9e69f19..db1512a 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -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) {