| commit | df6308eb82bc9d2074b35387583548b8b153433d | |
| author | Eric Sunshine <sunshine@sunshineco.com> | |
| Tue, 23 Jul 2013 14:28:08 +0000 (23 10:28 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Jul 2013 19:09:48 +0000 (23 12:09 -0700) | ||
| tree | 4edf2970e95e0dcedb2d2e8b97c44d7ea15b3057 | treesnapshot (tar.gz zip) |
| parent | f8395edc6f5c59a92adcf42ea20a01872ec22700 | commitdiff |
line-log: fix "log -LN" crash when N is last line of file
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>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.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>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| line-log.c | diffblobblamehistory | |
| t/t4211-line-log.sh | diffblobblamehistory |