about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2010-02-27 12:53:27 +0100
committerLars Hjemli <hjemli@gmail.com>2010-02-27 12:53:27 +0100
commit71d3ca75d1e941948dd3b965f5a5c2f2865e94fd (patch)
tree703e8cfe4bc3715833afa824d2f2bd320eb9a89e
parentMerge branch 'stable' (diff)
parentClear the whole context (diff)
downloadcgit-pink-71d3ca75d1e941948dd3b965f5a5c2f2865e94fd.tar.gz
cgit-pink-71d3ca75d1e941948dd3b965f5a5c2f2865e94fd.zip
Merge branch 'stable'
-rw-r--r--cgit.c2
-rw-r--r--ui-shared.c4
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
@@ -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 08ea003..8827fff 100644
--- 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);