Prevent git-upload-pack segfault if object cannot be found

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/sha1_file.c b/sha1_file.c
index 3d11a9bfdc56c00056c2057af5e6455742ab31f5..f08b1d6ee84617d8d866e9dab66e95ce5a5cc420 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -551,8 +551,10 @@ static void prepare_packed_git_one(char *objdir, int local)
        sprintf(path, "%s/pack", objdir);
        len = strlen(path);
        dir = opendir(path);
        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;
                return;

+       }

        path[len++] = '/';
        while ((de = readdir(dir)) != NULL) {
                int namelen = strlen(de->d_name);
        path[len++] = '/';
        while ((de = readdir(dir)) != NULL) {
                int namelen = strlen(de->d_name);

diff --git a/upload-pack.c b/upload-pack.c
index d1980556ca5b9c62a76129907cc511cd5c0c6c83..3606529f61c50aa1c4d73877ccc4601ef036fcb5 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -216,6 +216,9 @@ static int send_ref(const char *refname, const unsigned char *sha1)
        static char *capabilities = "multi_ack";
        struct object *o = parse_object(sha1);
 
        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);
        if (capabilities)
                packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
                        0, capabilities);