diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2010-08-03 22:06:21 +0200 | 
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-03 22:06:21 +0200 | 
| commit | 3687be20bc4abf0c0c197d617afaa3a717b1ab9c (patch) | |
| tree | c1f8f6f93006ffb583c1f0d84607934144caf89b | |
| parent | Reencode author and committer (diff) | |
| download | cgit-3687be20bc4abf0c0c197d617afaa3a717b1ab9c.tar.gz cgit-3687be20bc4abf0c0c197d617afaa3a717b1ab9c.tar.bz2 cgit-3687be20bc4abf0c0c197d617afaa3a717b1ab9c.zip | |
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 tag info.
Noticed-by: Eugene Sajine <euguess@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | ui-refs.c | 26 | 
1 files changed, 14 insertions, 12 deletions
| @@ -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) | 
