[PATCH 5/5] line-log: fix "log -LN" crash when N is last line of file
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jul 23, 2013, 14:28 UTC
- Message-ID
- <1374589688-27751-6-git-send-email-sunshine@sunshineco.com>
- In-Reply-To
- <1374589688-27751-1-git-send-email-sunshine@sunshineco.com>
range-set invariants are: ranges must be (1) non-empty, (2) disjoint, (3) sorted in ascending order.
line_log_data_insert() breaks the non-empty invariant under the following conditions: the incoming range is empty and the pathname attached to the range has not yet been encountered. In this case, line_log_data_insert() assigns the empty range to a new line_log_data record without taking any action to ensure that the empty range is eventually folded out. Subsequent range-set functions crash or throw an assertion failure upon encountering such an anomaly. Fix this bug.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> --- line-log.c | 1 + t/t4211-line-log.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/line-log.c b/line-log.c index 6f94d56..c2d01dc 100644 --- a/line-log.c +++ b/line-log.c @@ -299,6 +299,7 @@ static void line_log_data_insert(struct line_log_data **list, p = xcalloc(1, sizeof(struct line_log_data)); p->path = path; range_set_append(&p->ranges, begin, end); + sort_and_merge_range_set(&p->ranges); if (ip) { p->next = ip->next; ip->next = p; diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index 7616365..94267d7 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -72,7 +72,7 @@ test_expect_success '-L {empty-range} (any -L)' ' git log -L1,1:b.c -L$n:b.c ' -test_expect_failure '-L {empty-range} (first -L)' ' +test_expect_success '-L {empty-range} (first -L)' ' n=$(expr $(cat b.c | wc -l) + 1) && git log -L$n:b.c '
-- 1.8.3.4.1120.gc240c48