From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by sourceware.org (Postfix) with ESMTPS id E4245385E837 for ; Mon, 8 Jan 2024 13:56:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E4245385E837 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=SystematicSW.ab.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=SystematicSW.ab.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E4245385E837 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=216.40.44.16 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704722191; cv=none; b=sJgRLCGjZ2p3IJ1dC1IBV0Qzweki/MP4sFT9mbLd5DReKq2VjkvYSAhNdv4MooEPkQaLn+y59SozLwvRtXgdXZVU3gSxIsNxocJVVH58+NjdhK5bmDNzyPQ2pSVndi+Av3xH9+GZJiHIsF2hr/YeWv7L62V0c6Qvkbtq+2Muh1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704722191; c=relaxed/simple; bh=S+rUCWnnC65u74TMiKkjDSwsBOF2bzY337OwRmiw/rc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=COWtqeeGTuXM0sVHrvoK7h0FtW0XyM70fltmO5wOcPQFxsAYk54pR5LZqIRkJq6+xNRXeWeJqTVNgJleEKMd57o3matAU8xkCM1XZr5P0UTFY8fZ5mQaU/Bv4kRYTxSQ+YArEC2/dBgdMzhUnJ2tm08sRPnr6hbXhgYeOtOGAsk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from omf10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 584A41A0834; Mon, 8 Jan 2024 13:56:29 +0000 (UTC) Received: from [HIDDEN] (Authenticated sender: Brian.Inglis@SystematicSW.ab.ca) by omf10.hostedemail.com (Postfix) with ESMTPA id 137A932; Mon, 8 Jan 2024 13:56:26 +0000 (UTC) From: Brian Inglis To: newlib@sourceware.org Subject: [PATCH] fix strverscmp comparison of digit sequence with non-digits Date: Mon, 8 Jan 2024 06:56:21 -0700 Message-ID: X-Mailer: git-send-email 2.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: q8exurjgy8cybeqduf9ibuxxjhotee3q X-Rspamd-Server: rspamout07 X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Rspamd-Queue-Id: 137A932 X-Session-Marker: 427269616E2E496E676C69734053797374656D6174696353572E61622E6361 X-Session-ID: U2FsdGVkX199oxnZ+p52Z5mjaB3QT2n9l1QYaaPb0Y4= X-HE-Tag: 1704722186-228126 X-HE-Meta: U2FsdGVkX19MQFCbe4RCpnE7gwM03S7n/KPD0mrSOQ7UU4HbL0BcKcD3BBpH62KpeZyHsNILGCC7Stlz28GawYDhGJW6Olh3GymzibxMIdQg79/a5kuGa6cLNYXvesYSeXnBOkaj33GzK9mtAe1uTGwQ6oMLL88n1kbWYDT48BrUNcd1LkrBowiCVkj8zYS669MR77z8jUBcU20XKN7v2KdkeJ4K+88640uiU5iwXkD98WF81jzxB5H89jArXgkipZHhfWwhpg8Yf5YWh+8LpoHxoyWjIGP+RNQVB/zHS80TOAU98at5sbx8UZ0kkw4o4lejmwjdfdY= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: >From: Rich Felker Date: Mon, 7 Nov 2022 22:17:55 -0500 the rule that longest digit sequence not beginning with a zero is greater only applies when both sequences being compared are non-degenerate. this is spelled out explicitly in the man page, which may be deemed authoritative for this nonstandard function: "If one or both of these is empty, then return what strcmp(3) would have returned..." we were wrongly treating any sequence of digits not beginning with a zero as greater than a non-digit in the other string. Signed-off-by: Brian Inglis --- newlib/libc/string/strverscmp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/newlib/libc/string/strverscmp.c b/newlib/libc/string/strverscmp.c index 04aa7213ad98..0117421c9e93 100644 --- a/newlib/libc/string/strverscmp.c +++ b/newlib/libc/string/strverscmp.c @@ -76,9 +76,9 @@ int strverscmp(const char *l0, const char *r0) else if (c!='0') z=0; } - if (l[dp]!='0' && r[dp]!='0') { - /* If we're not looking at a digit sequence that began - * with a zero, longest digit string is greater. */ + if (l[dp]-'1'<9U && r[dp]-'1'<9U) { + /* If we're looking at non-degenerate digit sequences starting + * with nonzero digits, longest digit string is greater. */ for (j=i; isdigit(l[j]); j++) if (!isdigit(r[j])) return 1; if (isdigit(r[j])) return -1; -- 2.42.1