author | Lars Hjemli <hjemli@gmail.com> | 2008-03-17 22:13:16 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-17 22:51:47 (UTC) |
commit | e01f1403b9b501c563b1fe0e0052460a95945528 (patch) (side-by-side diff) | |
tree | eff9fd11272714db70bf2ac7116511f03d800af6 /ui-patch.c | |
parent | 0537a7d1cfdf7934d91798a623030fd454b356af (diff) | |
download | cgit-e01f1403b9b501c563b1fe0e0052460a95945528.zip cgit-e01f1403b9b501c563b1fe0e0052460a95945528.tar.gz cgit-e01f1403b9b501c563b1fe0e0052460a95945528.tar.bz2 |
Fix segfault in patch view for root commit
The code for patch view assumed the current commit would always have a parent,
which made cgit segfault when that wasn't the case.
This fixes the bug and adds a test-script for patch view which includes a test
for the inital commit.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-patch.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -67,44 +67,48 @@ static void filepair_cb(struct diff_filepair *pair) if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) html("Error running diff"); } void cgit_print_patch(char *hex, struct cacheitem *item) { struct commit *commit; struct commitinfo *info; unsigned char sha1[20], old_sha1[20]; char *patchname; if (!hex) hex = cgit_query_head; if (get_sha1(hex, sha1)) { cgit_print_error(fmt("Bad object id: %s", hex)); return; } commit = lookup_commit_reference(sha1); if (!commit) { cgit_print_error(fmt("Bad commit reference: %s", hex)); return; } info = cgit_parse_commit(commit); + + if (commit->parents && commit->parents->item) hashcpy(old_sha1, commit->parents->item->object.sha1); + else + hashclr(old_sha1); patchname = fmt("%s.patch", sha1_to_hex(sha1)); cgit_print_snapshot_start("text/plain", patchname, item); htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); htmlf("From: %s%s\n", info->author, info->author_email); html("Date: "); cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); htmlf("Subject: %s\n\n", info->subject); if (info->msg && *info->msg) { htmlf("%s", info->msg); if (info->msg[strlen(info->msg) - 1] != '\n') html("\n"); } html("---\n"); cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); html("--\n"); htmlf("cgit %s\n", CGIT_VERSION); cgit_free_commitinfo(info); } |