From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 3/3] validate_headref: use get_oid_hex for detached HEADs
Date: Wed, 27 Sep 2017 02:17:36 -0400 [thread overview]
Message-ID: <20170927061736.reeavh5r3tyqovbc@sigill.intra.peff.net> (raw)
In-Reply-To: <20170927061644.gwlhxaiairiy2njp@sigill.intra.peff.net>
If a candidate HEAD isn't a symref, we check that it
contains a viable sha1. But in a post-sha1 world, we should
be checking whether it has any plausible object-id.
We can do that by switching to get_oid_hex().
Note that both before and after this patch, we only check
for a plausible object id at the start of the file, and then
call that good enough. We ignore any content _after_ the
hex, so a string like:
0123456789012345678901234567890123456789 foo
is accepted. Though we do put extra bytes like this into
some pseudorefs (e.g., FETCH_HEAD), we don't typically do so
with HEAD. We could tighten this up by using parse_oid_hex(),
like:
if (!parse_oid_hex(buffer, &oid, &end) &&
*end++ == '\n' && *end == '\0')
return 0;
But we're probably better to remain on the loose side. We're
just checking here for a plausible-looking repository
directory, so heuristics are acceptable (if we really want
to be meticulous, we should use the actual ref code to parse
HEAD).
Signed-off-by: Jeff King <peff@peff.net>
---
path.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/path.c b/path.c
index 2ef3a86613..5aa9244eb2 100644
--- a/path.c
+++ b/path.c
@@ -639,7 +639,7 @@ int validate_headref(const char *path)
struct stat st;
char buffer[256];
const char *refname;
- unsigned char sha1[20];
+ struct object_id oid;
int fd;
ssize_t len;
@@ -680,7 +680,7 @@ int validate_headref(const char *path)
/*
* Is this a detached HEAD?
*/
- if (!get_sha1_hex(buffer, sha1))
+ if (!get_oid_hex(buffer, &oid))
return 0;
return -1;
--
2.14.2.988.g01c8b37dde
prev parent reply other threads:[~2017-09-27 6:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-27 6:16 [PATCH 0/3] validate_headref: avoid reading uninitialized bytes Jeff King
2017-09-27 6:17 ` [PATCH 1/3] validate_headref: NUL-terminate HEAD buffer Jeff King
2017-09-27 7:06 ` Junio C Hamano
2017-09-27 7:16 ` Jeff King
2017-09-27 7:28 ` Junio C Hamano
2017-09-27 6:17 ` [PATCH 2/3] validate_headref: use skip_prefix for symref parsing Jeff King
2017-09-27 7:07 ` Junio C Hamano
2017-09-27 6:17 ` Jeff King [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170927061736.reeavh5r3tyqovbc@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).