undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

range-set: satisfy non-empty ranges invariant

Browse Source 
range-set invariants are: ranges must be (1) non-empty, (2) disjoint,
(3) sorted in ascending order.

During processing, various range-set utility functions break the
invariants (for instance, by adding empty ranges), with the
expectation that a finalizing sort_and_merge_range_set() will restore
sanity.

sort_and_merge_range_set(), however, neglects to fold out empty
ranges, thus it fails to satisfy the non-empty constraint. Subsequent
range-set functions crash or throw an assertion failure upon
encountering such an anomaly. Rectify the situation by having
sort_and_merge_range_set() fold out empty ranges.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Sunshine 2013-07-23 10:28:06 -04:00 committed by Junio C Hamano
parent 99780b0a4a
commit f8395edc6f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
line-log.c
View File

@ -115,6 +115,8 @@ static void sort_and_merge_range_set(struct range_set *rs)
qsort(rs->ranges, rs->nr, sizeof(struct range), range_cmp); qsort(rs->ranges, rs->nr, sizeof(struct range), range_cmp);
for (i = 0; i < rs->nr; i++) { for (i = 0; i < rs->nr; i++) {
if (rs->ranges[i].start == rs->ranges[i].end)
continue;
if (o > 0 && rs->ranges[i].start <= rs->ranges[o-1].end) { if (o > 0 && rs->ranges[i].start <= rs->ranges[o-1].end) {
if (rs->ranges[o-1].end < rs->ranges[i].end) if (rs->ranges[o-1].end < rs->ranges[i].end)
rs->ranges[o-1].end = rs->ranges[i].end; rs->ranges[o-1].end = rs->ranges[i].end;

3
t/t4211-line-log.sh
View File

@ -67,7 +67,8 @@ test_bad_opts "-L :foo:b.c" "no match"
# There is a separate bug when an empty -L range is the first -L encountered, # There is a separate bug when an empty -L range is the first -L encountered,
# thus to demonstrate this particular bug, the empty -L range must follow a # thus to demonstrate this particular bug, the empty -L range must follow a
# non-empty -L range. # non-empty -L range.
test_expect_failure '-L {empty-range} (any -L)' ' test_expect_success '-L {empty-range} (any -L)' '
n=$(expr $(cat b.c | wc -l) + 1) &&
n=$(expr $(wc -l <b.c) + 1) && n=$(expr $(wc -l <b.c) + 1) &&
git log -L1,1:b.c -L$n:b.c git log -L1,1:b.c -L$n:b.c
' '