From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Elijah Newren <newren@gmail.com>, Jeff King <peff@peff.net>,
Phillip Wood <phillip.wood123@gmail.com>
Subject: [PATCH v2 5/7] object-name: use hexval
Date: Mon, 7 Sep 2026 19:59:38 +0000 [thread overview]
Message-ID: <20260907195941.1024289-6-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20260907195941.1024289-1-sandals@crustytoothpaste.net>
We've open-coded a different implementation of parsing hex values here
when we already have a perfectly good one in hexval. This
implementation will almost certainly be slower because it isn't
table-driven, unlike the other one, and since it's not constant time it
has no other advantages either. To tidy things up and prepare for
future work, switch to hexval in this case.
Because hexval returns an unsigned int, check to see if the value is
invalid by looking for any bits beyond a single unsigned character. In
addition, be sure to continue to force the hexadecimal value to
lowercase.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
object-name.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/object-name.c b/object-name.c
index 4eda8c8eac..8f2da51547 100644
--- a/object-name.c
+++ b/object-name.c
@@ -236,20 +236,13 @@ static int parse_oid_prefix(const char *name, int len,
{
for (int i = 0; i < len; i++) {
unsigned char c = name[i];
- unsigned char val;
- if (c >= '0' && c <= '9') {
- val = c - '0';
- } else if (c >= 'a' && c <= 'f') {
- val = c - 'a' + 10;
- } else if (c >= 'A' && c <='F') {
- val = c - 'A' + 10;
- c -= 'A' - 'a';
- } else {
+ int val = hexval(c, HEX_KIND_OID);
+
+ if (val & ~0xff)
return -1;
- }
if (hex_out)
- hex_out[i] = c;
+ hex_out[i] = tolower(c);
if (oid_out) {
if (!(i & 1))
val <<= 4;
next prev parent reply other threads:[~2026-09-07 20:00 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-29 23:32 [RFC PATCH 0/6] Git 3.0: restrict hex object IDs to lowercase only brian m. carlson
2026-07-29 23:32 ` [RFC PATCH 1/6] hex: add functionality for lowercase-only hex brian m. carlson
2026-07-31 7:38 ` Junio C Hamano
2026-08-25 15:39 ` Junio C Hamano
2026-08-25 21:44 ` brian m. carlson
2026-07-29 23:32 ` [RFC PATCH 2/6] hex: allow specifying hex type with hex2chr brian m. carlson
2026-07-29 23:32 ` [RFC PATCH 3/6] hex: make hex_to_bytes accept kind of hex to use brian m. carlson
2026-07-31 7:38 ` Junio C Hamano
2026-08-01 14:35 ` Jeff King
2026-07-29 23:32 ` [RFC PATCH 4/6] hex: label usages of hex parsing for object IDs brian m. carlson
2026-07-31 3:24 ` Junio C Hamano
2026-08-25 16:11 ` Junio C Hamano
2026-07-29 23:32 ` [RFC PATCH 5/6] object-name: use hexval brian m. carlson
2026-08-25 16:19 ` Junio C Hamano
2026-08-25 19:44 ` Elijah Newren
2026-08-25 21:41 ` brian m. carlson
2026-07-29 23:32 ` [RFC PATCH 6/6] hex: allow only lowercase object IDs in breaking changes mode brian m. carlson
2026-07-31 7:48 ` Junio C Hamano
2026-07-31 12:33 ` Junio C Hamano
2026-08-02 22:09 ` brian m. carlson
2026-08-04 19:32 ` Junio C Hamano
2026-08-04 21:46 ` brian m. carlson
2026-08-05 3:09 ` Michael Montalbo
2026-08-25 9:04 ` Phillip Wood
2026-08-25 21:36 ` brian m. carlson
2026-09-07 13:37 ` Phillip Wood
2026-08-25 16:36 ` Junio C Hamano
2026-08-25 19:44 ` Elijah Newren
2026-07-30 8:21 ` [RFC PATCH 0/6] Git 3.0: restrict hex object IDs to lowercase only Junio C Hamano
2026-07-30 21:18 ` brian m. carlson
2026-08-01 14:45 ` Jeff King
2026-08-01 18:22 ` Junio C Hamano
2026-08-02 21:55 ` brian m. carlson
2026-09-07 19:59 ` [PATCH v2 0/7] " brian m. carlson
2026-09-07 19:59 ` [PATCH v2 1/7] hex: add functionality for lowercase-only hex brian m. carlson
2026-09-07 19:59 ` [PATCH v2 2/7] hex: allow specifying hex type with hex2chr brian m. carlson
2026-09-07 19:59 ` [PATCH v2 3/7] hex: make hex_to_bytes accept kind of hex to use brian m. carlson
2026-09-07 19:59 ` [PATCH v2 4/7] hex: label usages of hex parsing for object IDs brian m. carlson
2026-09-07 19:59 ` brian m. carlson [this message]
2026-09-07 19:59 ` [PATCH v2 6/7] t5324: adjust tests for corrupt commit-graph brian m. carlson
2026-09-07 19:59 ` [PATCH v2 7/7] hex: allow only lowercase object IDs in breaking changes mode brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260907195941.1024289-6-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox