diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-28 17:13:33 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-28 13:59:39 -0800 |
| commit | 5d6b151fdd0a9e41ba68b444760616da1a008433 (patch) | |
| tree | 6e463b88e1adb37eb8248ce0ca179929a2ba7aa5 /t | |
| parent | git-svn: sort multi-init output (diff) | |
| download | tgif-5d6b151fdd0a9e41ba68b444760616da1a008433.tar.xz | |
xdl_merge(): fix a segmentation fault when refining conflicts
The function xdl_refine_conflicts() tries to break down huge
conflicts by doing a diff on the conflicting regions. However,
this does not make sense when one side is empty.
Worse, when one side is not only empty, but after EOF, the code
accessed unmapped memory.
Noticed by Luben Tuikov, Shawn Pearce and Alexandre Julliard, the
latter providing a test case.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
| -rw-r--r-- | t/t6023-merge-file.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index 5d9b6f34b8..1c21d8c986 100644 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -112,5 +112,27 @@ EOF test_expect_success "expected conflict markers, with -L" \ "diff -u test.txt expect.txt" +sed "s/ tu / TU /" < new1.txt > new5.txt +test_expect_failure "conflict in removed tail" \ + "git-merge-file -p orig.txt new1.txt new5.txt > out" + +cat > expect << EOF +Dominus regit me, +et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +<<<<<<< orig.txt +======= +Nam et si ambulavero in medio umbrae mortis, +non timebo mala, quoniam TU mecum es: +virga tua et baculus tuus ipsa me consolata sunt. +>>>>>>> new5.txt +EOF + +test_expect_success "expected conflict markers" "diff -u expect out" + test_done |