Avoid null pointer dereference in cgit_print_diff().

[cgit.git] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 42e81ace3a12216196270edab629a5fcdf59aa13..d21541bd4d2b79d19222fc9dd09ae14e70d59e51 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -34,6 +34,17 @@ static struct fileinfo {
 } *items;
 
 static int use_ssdiff = 0;
+static struct diff_filepair *current_filepair;
+
+struct diff_filespec *cgit_get_current_old_file(void)
+{
+       return current_filepair->one;
+}
+
+struct diff_filespec *cgit_get_current_new_file(void)
+{
+       return current_filepair->two;
+}
 
 static void print_fileinfo(struct fileinfo *info)
 {
@@ -92,7 +103,7 @@ static void print_fileinfo(struct fileinfo *info)
                      info->old_path);
        html("</td><td class='right'>");
        if (info->binary) {
-               htmlf("bin</td><td class='graph'>%d -> %d bytes",
+               htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
                      info->old_size, info->new_size);
                return;
        }
@@ -127,7 +138,7 @@ static void inspect_filepair(struct diff_filepair *pair)
        lines_added = 0;
        lines_removed = 0;
        cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
-                       &binary, count_diff_lines);
+                       &binary, 0, ctx.qry.ignorews, count_diff_lines);
        if (files >= slots) {
                if (slots == 0)
                        slots = 4;
@@ -154,17 +165,36 @@ static void inspect_filepair(struct diff_filepair *pair)
 }
 
 void cgit_print_diffstat(const unsigned char *old_sha1,
-                        const unsigned char *new_sha1)
+                        const unsigned char *new_sha1, const char *prefix)
 {
-       int i;
+       int i, save_context = ctx.qry.context;
 
        html("<div class='diffstat-header'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                       ctx.qry.sha2, NULL, 0);
+       if (prefix) {
+               html(" (limited to '");
+               html_txt(prefix);
+               html("')");
+       }
+       html(" (");
+       ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
+       cgit_self_link("more", NULL, NULL, &ctx);
+       html("/");
+       ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;
+       cgit_self_link("less", NULL, NULL, &ctx);
+       ctx.qry.context = save_context;
+       html(" context)");
+       html(" (");
+       ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
+       cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
+       ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
+       html(" whitespace changes)");
        html("</div>");
        html("<table summary='diffstat' class='diffstat'>");
        max_changes = 0;
-       cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
+       cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
+                      ctx.qry.ignorews);
        for(i = 0; i<files; i++)
                print_fileinfo(&items[i]);
        html("</table>");
@@ -246,8 +276,6 @@ static void header(unsigned char *sha1, char *path1, int mode1,
                        html_txt(path2);
        }
        html("</div>");
-       if (use_ssdiff)
-               cgit_ssdiff_header();
 }
 
 static void print_ssdiff_link()
@@ -255,11 +283,11 @@ static void print_ssdiff_link()
        if (!strcmp(ctx.qry.page, "diff")) {
                if (use_ssdiff)
                        cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
-                                      ctx.qry.sha1, ctx.qry.sha2, NULL, 1);
+                                      ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
                else
                        cgit_diff_link("Side-by-side diff", NULL, NULL,
                                       ctx.qry.head, ctx.qry.sha1,
-                                      ctx.qry.sha2, NULL, 1);
+                                      ctx.qry.sha2, ctx.qry.path, 1);
        }
 }
 
@@ -270,24 +298,34 @@ static void filepair_cb(struct diff_filepair *pair)
        int binary = 0;
        linediff_fn print_line_fn = print_line;
 
-       header(pair->one->sha1, pair->one->path, pair->one->mode,
-              pair->two->sha1, pair->two->path, pair->two->mode);
+       current_filepair = pair;
        if (use_ssdiff) {
-               cgit_ssdiff_header();
+               cgit_ssdiff_header_begin();
                print_line_fn = cgit_ssdiff_line_cb;
        }
+       header(pair->one->sha1, pair->one->path, pair->one->mode,
+              pair->two->sha1, pair->two->path, pair->two->mode);
+       if (use_ssdiff)
+               cgit_ssdiff_header_end();
        if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
                if (S_ISGITLINK(pair->one->mode))
-                       print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
+                       print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
                if (S_ISGITLINK(pair->two->mode))
-                       print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
+                       print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
+               if (use_ssdiff)
+                       cgit_ssdiff_footer();
                return;
        }
        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-                           &new_size, &binary, print_line_fn))
+                           &new_size, &binary, ctx.qry.context,
+                           ctx.qry.ignorews, print_line_fn))
                cgit_print_error("Error running diff");
-       if (binary)
-               html("Binary files differ");
+       if (binary) {
+               if (use_ssdiff)
+                       html("<tr><td colspan='4'>Binary files differ</td></tr>");
+               else
+                       html("Binary files differ");
+       }
        if (use_ssdiff)
                cgit_ssdiff_footer();
 }
@@ -307,8 +345,10 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
                return;
        }
        commit = lookup_commit_reference(new_rev_sha1);
-       if (!commit || parse_commit(commit))
+       if (!commit || parse_commit(commit)) {
                cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
+               return;
+       }
 
        if (old_rev)
                get_sha1(old_rev, old_rev_sha1);
@@ -324,19 +364,27 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
                        return;
                }
                commit2 = lookup_commit_reference(old_rev_sha1);
-               if (!commit2 || parse_commit(commit2))
+               if (!commit2 || parse_commit(commit2)) {
                        cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
+                       return;
+               }
        }
 
        if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
                use_ssdiff = 1;
 
        print_ssdiff_link();
-       cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
+       cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
 
-       html("<table summary='diff' class='diff'>");
-       html("<tr><td>");
-       cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
-       html("</td></tr>");
+       if (use_ssdiff) {
+               html("<table summary='ssdiff' class='ssdiff'>");
+       } else {
+               html("<table summary='diff' class='diff'>");
+               html("<tr><td>");
+       }
+       cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
+                      ctx.qry.ignorews);
+       if (!use_ssdiff)
+               html("</td></tr>");
        html("</table>");
 }