ssh-upload: prevent buffer overrun

diff --git a/builtin-prune.c b/builtin-prune.c
index 286a94c3fc46e2af1f0a31fbaa4aaacf7b876783..b469c43bc55440d982005b81252ebfd711faa074 100644 (file)
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -20,10 +20,11 @@ static int prune_object(char *path, const char *filename, const unsigned char *s
        const char *type;
 
        if (show_only) {
-               type = buf;
-               if (sha1_object_info(sha1, type, NULL))
+               if (sha1_object_info(sha1, buf, NULL))
                        type = "unknown";
-               printf("%s %s\n", sha1_to_hex(sha1), type );
+               else
+                       type = buf;
+               printf("%s %s\n", sha1_to_hex(sha1), type);
                return 0;
        }
        unlink(mkpath("%s/%s", path, filename));
@@ -180,12 +181,28 @@ static void walk_commit_list(struct rev_info *revs)
        }
 }
 
+static int add_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, char *datail, void *cb_data)
+{
+       struct object *object;
+
+       object = parse_object(osha1);
+       if (object)
+               add_pending_object(&revs, object, "");
+       object = parse_object(nsha1);
+       if (object)
+               add_pending_object(&revs, object, "");
+       return 0;
+}
+
 static int add_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 {
        struct object *object = parse_object(sha1);
        if (!object)
                die("bad object ref: %s:%s", path, sha1_to_hex(sha1));
        add_pending_object(&revs, object, "");
+
+       for_each_reflog_ent(path, add_one_reflog_ent, NULL);
+
        return 0;
 }
 
@@ -236,6 +253,8 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
                usage(prune_usage);
        }
 
+       save_commit_buffer = 0;
+
        /*
         * Set up revision parsing, and mark us as being interested
         * in all object types, not just commits.