ui-diff: Check the return value of get_sha1()

[cgit.git] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 8b38209a82e12dff0f89e62484dd8a2b84e4d83a..1209c47c6c0b45f599dd98813dfab3282992a0a7 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -358,17 +358,13 @@ void cgit_print_diff_ctrls()
 }
 
 void cgit_print_diff(const char *new_rev, const char *old_rev,
-                    const char *prefix, int show_ctrls)
+                    const char *prefix, int show_ctrls, int raw)
 {
-       enum object_type type;
-       unsigned long size;
        struct commit *commit, *commit2;
 
        if (!new_rev)
                new_rev = ctx.qry.head;
-       get_sha1(new_rev, new_rev_sha1);
-       type = sha1_object_info(new_rev_sha1, &size);
-       if (type == OBJ_BAD) {
+       if (get_sha1(new_rev, new_rev_sha1)) {
                cgit_print_error("Bad object name: %s", new_rev);
                return;
        }
@@ -378,19 +374,18 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                return;
        }
 
-       if (old_rev)
-               get_sha1(old_rev, old_rev_sha1);
-       else if (commit->parents && commit->parents->item)
+       if (old_rev) {
+               if (get_sha1(old_rev, old_rev_sha1)) {
+                       cgit_print_error("Bad object name: %s", old_rev);
+                       return;
+               }
+       } else if (commit->parents && commit->parents->item) {
                hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
-       else
+       } else {
                hashclr(old_rev_sha1);
+       }
 
        if (!is_null_sha1(old_rev_sha1)) {
-               type = sha1_object_info(old_rev_sha1, &size);
-               if (type == OBJ_BAD) {
-                       cgit_print_error("Bad object name: %s", sha1_to_hex(old_rev_sha1));
-                       return;
-               }
                commit2 = lookup_commit_reference(old_rev_sha1);
                if (!commit2 || parse_commit(commit2)) {
                        cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1));
@@ -398,6 +393,14 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                }
        }
 
+       if (raw) {
+               ctx.page.mimetype = "text/plain";
+               cgit_print_http_headers(&ctx);
+               cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb_raw,
+                              prefix, 0);
+               return;
+       }
+
        use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
 
        if (show_ctrls)