From nobody Thu Aug 24 21:51:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RWxc12nHVz4rcpB; Thu, 24 Aug 2023 21:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWxc12LHYz3XZD; Thu, 24 Aug 2023 21:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692913873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpaSfCuaNkwK3rFQH/SGVzPjwgljXFZj/sDUg4efAYU=; b=N2S11iF/iztANJbmq2/xI8xC7Bk00KF880VtxPwxjK6w9FCgwWoMBXcTRDgKRnJzD2aOuB mSj82rAkVDpQ3cif7hPraXmbPHltZ6kyIfKZ0Lrocsa0Di5V4Fb++yHoUlTibrB+7sMKUu ivFKc7e6IIiapXHPxqua80YdvhQ9e364Gdg4kIk6RLrF0xqLwv+O+dyT8xjYvAe3PiTlt5 fvCqsYBPhtdLJSxGgUZ9Qpc6oXMcz1ZCJB04zFEZ6nAg5RpPMpgSCXE6EgalQKQx6apMFw jpk96kucWcN97BT8KvJnQKFs/ivleOAd4cHsNTdHsASY8Ekfwwuxm9TA5hUNyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692913873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpaSfCuaNkwK3rFQH/SGVzPjwgljXFZj/sDUg4efAYU=; b=bTIrTQ5y9yinAAsovUOc9+1VbAkO5xhtRvuRsY7exGJop5467r8NuQH18pB/U1HfRwwJgU F1VAAzfhrtEn0/FoLu3zCZrjRpxLhHf8mQL2l+sx9eSUmZZ7Vx5ahYjM3eqFWwKTDxErRE 8cM130f7ilEfxE7z+IMBFowdoa86WBE8LHdC7z9vapYT1Cde8FRiTGkABNDEsU9bysjmbp mxyxXVAjTp/+0U1aYvQ1S22yyesYNntRDMz90nHWweZhVgHGM4djYA+5BZf0/f+AkwgotT rTCIZkkC7lY3Muu2KsZeePoYPKEJof3j+X6VYuygHBye2FfKebp7jkcM/KEURA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692913873; a=rsa-sha256; cv=none; b=m4PsCacWFH78WnjUJfCS20m+dGyW1AiELnaG0NKbSMSLXN6uo6ODm+rmrOAgpNiRmil6Xw tUZ7dr3tw6EqXmJog2m3LUHiMtaKQPn1wwh6SCyAzDhznHVsGlbYo7s/qQ5uTVo65Usqv5 M2oG6BLoWvZHflkOjBYrZfqPDJP0RtyDhzEQZBf+DxpchovGavW3ycMMZKDM6JmQa+yGfE JFYYEKxa/JQbnhQ8QXzt7f2tZNvD/QSOlyIigXujOGqhoNlxiSvySgx5tK7m8sFRbdZqrV 5Tg2At5xr98+Am2aSieYn4hmYBiPzDy/wNWhbcBsNwyAfiYXm0sWELQFmw/yGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWxc11P73zjvs; Thu, 24 Aug 2023 21:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37OLpDXY037389; Thu, 24 Aug 2023 21:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37OLpDEn037386; Thu, 24 Aug 2023 21:51:13 GMT (envelope-from git) Date: Thu, 24 Aug 2023 21:51:13 GMT Message-Id: <202308242151.37OLpDEn037386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b8b6bef43f87 - main - libc: Fix parsing of hexadecimal numbers in strtol() family. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8b6bef43f876a0a0b8c0b4ae65135bcab4c7aa6 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b8b6bef43f876a0a0b8c0b4ae65135bcab4c7aa6 commit b8b6bef43f876a0a0b8c0b4ae65135bcab4c7aa6 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-24 21:31:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-24 21:31:54 +0000 libc: Fix parsing of hexadecimal numbers in strtol() family. This had previously been partly fixed in 2571c7f7200f. MFC after: 1 week Reviewed by: imp, allanjude, emaste Differential Revision: https://reviews.freebsd.org/D41510 --- lib/libc/iconv/_strtol.h | 5 ++++- lib/libc/iconv/_strtoul.h | 5 ++++- lib/libc/locale/wcstoimax.c | 5 ++++- lib/libc/locale/wcstol.c | 7 +++++-- lib/libc/locale/wcstoll.c | 5 ++++- lib/libc/locale/wcstoul.c | 5 ++++- lib/libc/locale/wcstoull.c | 5 ++++- lib/libc/locale/wcstoumax.c | 5 ++++- 8 files changed, 33 insertions(+), 9 deletions(-) diff --git a/lib/libc/iconv/_strtol.h b/lib/libc/iconv/_strtol.h index 786ae2efbaa9..d183edbe8c3a 100644 --- a/lib/libc/iconv/_strtol.h +++ b/lib/libc/iconv/_strtol.h @@ -83,7 +83,10 @@ _FUNCNAME(const char *nptr, char **endptr, int base) c = *s++; } if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) { + c == '0' && (*s == 'x' || *s == 'X') && + ((s[1] >= '0' && s[1] <= '9') || + (s[1] >= 'A' && s[1] <= 'F') || + (s[1] >= 'a' && s[1] <= 'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/iconv/_strtoul.h b/lib/libc/iconv/_strtoul.h index 2d5c7776b0e3..eade72e9c2e6 100644 --- a/lib/libc/iconv/_strtoul.h +++ b/lib/libc/iconv/_strtoul.h @@ -79,7 +79,10 @@ _FUNCNAME(const char *nptr, char **endptr, int base) c = *s++; } if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) { + c == '0' && (*s == 'x' || *s == 'X') && + ((s[1] >= '0' && s[1] <= '9') || + (s[1] >= 'A' && s[1] <= 'F') || + (s[1] >= 'a' && s[1] <= 'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoimax.c b/lib/libc/locale/wcstoimax.c index 6447fe6dccfd..259faa2b011c 100644 --- a/lib/libc/locale/wcstoimax.c +++ b/lib/libc/locale/wcstoimax.c @@ -78,7 +78,10 @@ wcstoimax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstol.c b/lib/libc/locale/wcstol.c index 183fb00bc507..b0b787384f39 100644 --- a/lib/libc/locale/wcstol.c +++ b/lib/libc/locale/wcstol.c @@ -63,7 +63,7 @@ wcstol_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int do { c = *s++; } while (iswspace_l(c, locale)); - if (c == '-') { + if (c == L'-') { neg = 1; c = *s++; } else { @@ -72,7 +72,10 @@ wcstol_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoll.c b/lib/libc/locale/wcstoll.c index 5e42d878e1c8..ac07d6c6adbf 100644 --- a/lib/libc/locale/wcstoll.c +++ b/lib/libc/locale/wcstoll.c @@ -78,7 +78,10 @@ wcstoll_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoul.c b/lib/libc/locale/wcstoul.c index d097c20db40a..9f58db799c0e 100644 --- a/lib/libc/locale/wcstoul.c +++ b/lib/libc/locale/wcstoul.c @@ -72,7 +72,10 @@ wcstoul_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoull.c b/lib/libc/locale/wcstoull.c index 5f8e8367308b..cbc7253f884d 100644 --- a/lib/libc/locale/wcstoull.c +++ b/lib/libc/locale/wcstoull.c @@ -78,7 +78,10 @@ wcstoull_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoumax.c b/lib/libc/locale/wcstoumax.c index ad9e9c334186..4380cccf2424 100644 --- a/lib/libc/locale/wcstoumax.c +++ b/lib/libc/locale/wcstoumax.c @@ -78,7 +78,10 @@ wcstoumax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16;