From patchwork Thu Oct 3 17:25:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Walch X-Patchwork-Id: 2985021 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 63D499F289 for ; Thu, 3 Oct 2013 17:28:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 40DD820316 for ; Thu, 3 Oct 2013 17:28:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1EF52202EB for ; Thu, 3 Oct 2013 17:28:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754566Ab3JCR0a (ORCPT ); Thu, 3 Oct 2013 13:26:30 -0400 Received: from mout.web.de ([212.227.15.3]:62202 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754515Ab3JCR02 (ORCPT ); Thu, 3 Oct 2013 13:26:28 -0400 Received: from tacticalops.localnet ([95.112.171.46]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0M6V5b-1VlnfH3q0Z-00yPMZ for ; Thu, 03 Oct 2013 19:26:26 +0200 From: Martin Walch To: linux-kbuild@vger.kernel.org Cc: Michal Marek , Arve =?ISO-8859-1?Q?Hj=F8nnev=E5g?= , Jiri Kosina , "Yann E. MORIN" , Benjamin Poirier , Dirk Gouders , Wang YanQing , Andrew Morton , Jean Delvare , Kees Cook , linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len Date: Thu, 03 Oct 2013 19:25:53 +0200 Message-ID: <2458916.eNjWPdyz4y@tacticalops> User-Agent: KMail/4.11.1 (Linux/3.10.7-gentoo-r1-gnu; KDE/4.11.1; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:QxBy7ReRimFaYpJqltshFizd2Ze57eiDY+mzp43U8tyodohfwS1 O5+5NYeXMzlhU6N1CZct0h2kN7guwFNOImVb+ERZzX8ry6GGj2oXxhc86S/ryXOzbYulfZQ cLzmBB8mGZwx/D5QFj2MbPDIftGd0LJLBoetTonIl80/Ud3z+/FpFTc8WNfz+m0Nr60IV82 8Xf7/SkPgC9kQm4dNc3cg== Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Martin Walch 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 Acked-by: Wang YanQing Acked-by: Benjamin Poirier --- scripts/kconfig/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) {