aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Walch <walch.martin@web.de>2015-04-15 11:24:38 +0100
committerAlex Shi <alex.shi@linaro.org>2015-04-15 20:03:08 +0800
commitb04591efd29ae924814d0559476ac421db86d9dd (patch)
tree0866a5a1367933876c15578c56d4c1d2404d69ee
parent1e8ac3b467f02f239d18135a91a67a00d971242b (diff)
downloadlinux-linaro-stable-b04591efd29ae924814d0559476ac421db86d9dd.tar.gz
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> (cherry picked from commit 503c823048e81cc85c0e9d8c297cc70203e335e5) Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--scripts/kconfig/menu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index fd3f0180e08f..24ad40942586 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -564,7 +564,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) {