From nobody Sat Sep 30 02:52:19 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 4RyBZr3Grzz4v94s; Sat, 30 Sep 2023 02:52:20 +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 4RyBZq5YYCz4Xmk; Sat, 30 Sep 2023 02:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696042339; 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=zdf5xnHoVLSLfJIDySijl8YmtDmHr3x7viAsQdqFFFI=; b=vqC22vTAHDuj8j1Hd7fFT9wJviVBG+35B5JEbJ5XTMYBVTIWqbwaEHpbVUxb+ql7na4Jve 3kltR7Oz4UMYN7kln2W7WkR0BeHDPjygBVS2ychyIb6R4nc5OGh/QNYKL/BKahNzZfh7OV XHLIeGXribMlvPfqscOaae5E5sVnb9QL6fqOMaUwHBAGdfga9TkUYaFAgxpmqzORrY+H9X ILPpVGWMKMfN//gOiMs1tMJf/AL3oi24zX2itUFOBCkaOzCOORpQLJqntlrp9UCKccKQ5Z tfZRB3jCnhlZtFmEd32d+4QjxbV+uHCu7jgvLoj4kYtDX6ho9EwAqFhfsjjWag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696042339; a=rsa-sha256; cv=none; b=kFRyI7r9en+FWVhxppPxe6pQpbDZLBcEWGVhNyjPzNkSvCyZt1Lywt0MzhXXmkpzPTR4Qv doGhmoZZ/T6h0Xh9kUOpqBxjJl3jIkrCy4Im5AQh6l/OOrZkiIMI3Xz/L9Zzf+u9rNI84I v+WOW8F1yQEZwb4dkkL2kg/aRIcxV3qQLx5x5gg7HS7cHhf63drXQsvXud8BeEd7R9USKb eUP7h3+GIcK7GswGeoSD76PYaYswscMMFk8d+Ygxh4HdbKfqmLdxzsGGZRsczLpwiddI2q jk+tHissRARUcfx4F19mMpWDnv3jpa1fHTfPOTsKCnT5b82oRbjTVVFYjQI39A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696042339; 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=zdf5xnHoVLSLfJIDySijl8YmtDmHr3x7viAsQdqFFFI=; b=DNScrleLPcp5aoV9zMT/kUjwFts1fIgl80sJilhWt5BHuqVvsSC8AWmTfXp1OCKe7QHFn0 1pBs+jFVixJFq3QId6bqDVdv1UjYn/hOCcCTmA1QwDFSZ5j+bvsCgvzQt6HzP3jQSb7pCQ Sx/mnRCT8qvSzBCygzCHs/2lEgkuPw7q5UhjhuVNHepqzdywtndFRPFjuxl7xGLctA+VLD DSMeKqzuG7Vk+242d0C7Pt81uL3lKt6n6lRDMZn+IIe6d+4tqdqRf70o2kO9l+7niHAzeM GcFLrz8eFrhJXnyaYqJSxDc4GJpb7CYoAgLNkT5beiT/Wcr1j/15d10TB/9NvA== 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 4RyBZq4bkDzVl2; Sat, 30 Sep 2023 02:52:19 +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 38U2qJdB044563; Sat, 30 Sep 2023 02:52:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38U2qJ78044560; Sat, 30 Sep 2023 02:52:19 GMT (envelope-from git) Date: Sat, 30 Sep 2023 02:52:19 GMT Message-Id: <202309300252.38U2qJ78044560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 56b09feb23d9 - stable/14 - regcomp: use unsigned char when testing for escapes 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 56b09feb23d98fcd0c4aed8d4f907a5a2f6b5ea9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=56b09feb23d98fcd0c4aed8d4f907a5a2f6b5ea9 commit 56b09feb23d98fcd0c4aed8d4f907a5a2f6b5ea9 Author: Christos Zoulas AuthorDate: 2023-08-30 20:37:24 +0000 Commit: Kyle Evans CommitDate: 2023-09-30 01:40:59 +0000 regcomp: use unsigned char when testing for escapes - cast GETNEXT to unsigned where it is being promoted to int to prevent sign-extension (really it would have been better for PEEK*() and GETNEXT() to return unsigned char; this would have removed a ton of (uch) casts, but it is too intrusive for now). - fix an isalpha that should have been iswalpha PR: 264275, 274032 Reviewed by: kevans, eugen (previous version) Obtained from: NetBSD (cherry picked from commit 3fb80f1476c7776f04ba7ef6d08397cef6abcfb0) --- lib/libc/regex/regcomp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index 791755ceb14d..42fa1b99e58e 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -828,10 +828,10 @@ p_simp_re(struct parse *p, struct branchc *bc) handled = false; assert(MORE()); /* caller should have ensured this */ - c = GETNEXT(); + c = (uch)GETNEXT(); if (c == '\\') { (void)REQUIRE(MORE(), REG_EESCAPE); - cc = GETNEXT(); + cc = (uch)GETNEXT(); c = BACKSL | cc; #ifdef LIBREGEX if (p->gnuext) { @@ -992,7 +992,7 @@ p_count(struct parse *p) int ndigits = 0; while (MORE() && isdigit((uch)PEEK()) && count <= DUPMAX) { - count = count*10 + (GETNEXT() - '0'); + count = count*10 + ((uch)GETNEXT() - '0'); ndigits++; } @@ -1302,7 +1302,7 @@ may_escape(struct parse *p, const wint_t ch) if ((p->pflags & PFLAG_LEGACY_ESC) != 0) return (true); - if (isalpha(ch) || ch == '\'' || ch == '`') + if (iswalpha(ch) || ch == '\'' || ch == '`') return (false); return (true); #ifdef NOTYET