On Tue, Aug 3, 2010 at 21:34, Eugene Sajine <euguess@xxxxxxxxx> wrote:
> It segfaults:
>
> #0 0x080538fa in cmp_tag_age (a=0x8bcc760, b=0x8bcc764) at ui-refs.c:52
Great, thanks for pinpointing the bug. Could you test if the following
patch fixes the problem? I've also attached it since gmail tend to
damage patches...
---snip---
From: Lars Hjemli <hjemli@xxxxxxxxx>
Date: Tue, 3 Aug 2010 22:06:21 +0200
Subject: [PATCH] ui-refs.c: avoid segfault on unparsed ref objects
When a ref refers to something other then a commit or tag object, cgit
could segfault when trying to display the ref info.
Noticed-by: Eugene Sajine <euguess@xxxxxxxxx>
Signed-off-by: Lars Hjemli <hjemli@xxxxxxxxx>
---
ui-refs.c | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ui-refs.c b/ui-refs.c
index d3b4f6e..6571cc4 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -42,23 +42,25 @@ static int cmp_branch_age(const void *a, const void *b)
return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
}
+static int get_ref_age(struct refinfo *ref)
+{
+ if (!ref->object)
+ return 0;
+ switch (ref->object->type) {
+ case OBJ_TAG:
+ return ref->tag ? ref->tag->tagger_date : 0;
+ case OBJ_COMMIT:
+ return ref->commit ? ref->commit->committer_date : 0;
+ }
+ return 0;
+}
+
static int cmp_tag_age(const void *a, const void *b)
{
struct refinfo *r1 = *(struct refinfo **)a;
struct refinfo *r2 = *(struct refinfo **)b;
- int r1date, r2date;
-
- if (r1->object->type != OBJ_COMMIT)
- r1date = r1->tag->tagger_date;
- else
- r1date = r1->commit->committer_date;
-
- if (r2->object->type != OBJ_COMMIT)
- r2date = r2->tag->tagger_date;
- else
- r2date = r2->commit->committer_date;
- return cmp_age(r1date, r2date);
+ return cmp_age(get_ref_age(r1), get_ref_age(r2));
}
static int print_branch(struct refinfo *ref)
--
1.7.1
Attachment:
0001-ui-refs.c-avoid-segfault-on-unparsed-ref-objects.patch
Description: Binary data