Merge branch 'stable'

2 files changed, 3 insertions, 3 deletions

diff --git a/cgit.c b/cgit.c
index e46c00a..9305d0a 100644
--- a/cgit.c
+++ b/cgit.c
@@ -255,17 +255,17 @@ static void querystring_cb(const char *name, const char *value)
 
 char *xstrdupn(const char *str)
 {
         return (str ? xstrdup(str) : NULL);
 }
 
 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;
         ctx->cfg.cache_dynamic_ttl = 5;
         ctx->cfg.cache_max_create_time = 5;
         ctx->cfg.cache_repo_ttl = 5;
         ctx->cfg.cache_root = CGIT_CACHE_ROOT;
         ctx->cfg.cache_root_ttl = 5;
diff --git a/ui-shared.c b/ui-shared.c
index 08ea003..8827fff 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -241,17 +241,17 @@ static char *repolink(char *title, char *class, char *page, char *head,
 }
 
 static void reporevlink(char *page, char *name, char *title, char *class,
                         char *head, char *rev, char *path)
 {
         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);
         }
         html("'>");
         html_txt(name);
         html("</a>");
 }
@@ -358,17 +358,17 @@ void cgit_snapshot_link(char *name, char *title, char *class, char *head,
 
 void cgit_diff_link(char *name, char *title, char *class, char *head,
                     char *new_rev, char *old_rev, char *path,
                     int toggle_ssdiff)
 {
         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);
                 delim = "&amp;";
         }
         if (old_rev) {
                 html(delim);
                 html("id2=");