[PATCH] Prevent git-upload-pack segfault if object cannot be found
From: Carl Worth <hidden>
Date: 2016-06-15 22:42:19
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Carl Worth <redacted> --- It's probably a just-don't-do-that situation, but I did-it by moving a directory that had already been cached in objects/info/alternates by clone -l -s. Here's a fix for the segfault that that turned up. Probably trivial enough to not bother the list with, but I'm still learning about formatting patches and mails and things, so I'm open to any feedback if I'm getting anything wrong. sha1_file.c | 4 +++- upload-pack.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sha1_file.c b/sha1_file.c
index 64cf245..1d799f7 100644
--- a/sha1_file.c
+++ b/sha1_file.c@@ -551,8 +551,10 @@ static void prepare_packed_git_one(char sprintf(path, "%s/pack", objdir); len = strlen(path); dir = opendir(path); - if (!dir) + if (!dir) { + fprintf(stderr, "unable to open object pack directory: %s: %s\n", path, strerror(errno)); return; + } path[len++] = '/'; while ((de = readdir(dir)) != NULL) { int namelen = strlen(de->d_name);
diff --git a/upload-pack.c b/upload-pack.c
index d198055..3606529 100644
--- a/upload-pack.c
+++ b/upload-pack.c@@ -216,6 +216,9 @@ static int send_ref(const char *refname, static char *capabilities = "multi_ack"; struct object *o = parse_object(sha1); + if (!o) + die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1)); + if (capabilities) packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname, 0, capabilities);
Attachments
- (unnamed) [application/pgp-signature] 189 bytes