From e01f1403b9b501c563b1fe0e0052460a95945528 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Mon, 17 Mar 2008 23:13:16 +0100 Subject: 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 --- tests/t0108-patch.sh | 37 +++++++++++++++++++++++++++++++++++++ ui-patch.c | 6 +++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100755 tests/t0108-patch.sh diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh new file mode 100755 index 0000000..33351d6 --- /dev/null +++ b/tests/t0108-patch.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +. ./setup.sh + +prepare_tests "Check content on patch page" + +run_test 'generate foo/patch' ' + cgit_query "url=foo/patch" >trash/tmp +' + +run_test 'find `From:` line' ' + grep -e "^From: " trash/tmp +' + +run_test 'find `Date:` line' ' + grep -e "^Date: " trash/tmp +' + +run_test 'find `Subject:` line' ' + grep -e "^Subject: commit 5" trash/tmp +' + +run_test 'find `cgit` signature' ' + tail -1 trash/tmp | grep -e "^cgit" +' + +run_test 'find initial commit' ' + root=$(git --git-dir=$PWD/trash/repos/foo/.git rev-list HEAD | tail -1) +' + +run_test 'generate patch for initial commit' ' + cgit_query "url=foo/patch&id=$root" >trash/tmp +' + +run_test 'find `cgit` signature' ' + tail -1 trash/tmp | grep -e "^cgit" +' diff --git a/ui-patch.c b/ui-patch.c index e7a010a..7ee2c41 100644 --- a/ui-patch.c +++ b/ui-patch.c @@ -88,7 +88,11 @@ void cgit_print_patch(char *hex, struct cacheitem *item) return; } info = cgit_parse_commit(commit); - hashcpy(old_sha1, commit->parents->item->object.sha1); + + 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); -- cgit v1.2.3-2-gb3c3