Merge branch 'html-updates' of git://github.com/MarkLodato/cgit

diff --git a/cgit.c b/cgit.c
index e46c00a48e9e97f78a38d41b87b1a98f088e941f..9305d0a873a191e730d622d14067a2eee56003a6 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -260,7 +260,7 @@ char *xstrdupn(const char *str)
 
 static void prepare_context(struct cgit_context *ctx)
 {
-       memset(ctx, 0, sizeof(ctx));
+       memset(ctx, 0, sizeof(*ctx));
        ctx->cfg.agefile = "info/web/last-modified";
        ctx->cfg.nocache = 0;
        ctx->cfg.cache_size = 0;

diff --git a/ui-shared.c b/ui-shared.c
index 08ea003c2da84378189303ebe99c8fe30216dcc3..8827fff4b19ed6b231a09f6870d4c2615deea82a 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -246,7 +246,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
        char *delim;
 
        delim = repolink(title, class, page, head, path);
-       if (rev && strcmp(rev, ctx.qry.head)) {
+       if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_url_arg(rev);
@@ -363,7 +363,7 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
        char *delim;
 
        delim = repolink(title, class, "diff", head, path);
-       if (new_rev && strcmp(new_rev, ctx.qry.head)) {
+       if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_url_arg(new_rev);