Staging
v0.8.1
v0.8.1
Revision 5d6b151fdd0a9e41ba68b444760616da1a008433 authored by Johannes Schindelin on 28 December 2006, 16:13:33 UTC, committed by Junio C Hamano on 28 December 2006, 21:59:39 UTC
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>
1 parent 4a4d94b
| File | Mode | Size |
|---|---|---|
| test | ||
| README | -rw-r--r-- | 3.1 KB |
| git-favicon.png | -rw-r--r-- | 164 bytes |
| git-logo.png | -rw-r--r-- | 208 bytes |
| gitweb.css | -rw-r--r-- | 6.4 KB |
| gitweb.perl | -rwxr-xr-x | 135.1 KB |
Computing file changes ...
