git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>,
	Junio C Hamano <gitster@pobox.com>,
	Thomas Rast <trast@inf.ethz.ch>,
	Bo Yang <struggleyb.nku@gmail.com>,
	Johannes Sixt <j.sixt@viscovery.net>
Subject: [PATCH 02/11] t8001/t8002: blame: demonstrate -L bounds checking bug
Date: Wed, 31 Jul 2013 04:15:36 -0400	[thread overview]
Message-ID: <1375258545-42240-3-git-send-email-sunshine@sunshineco.com> (raw)
In-Reply-To: <1375258545-42240-1-git-send-email-sunshine@sunshineco.com>

A bounds checking bug allows the X in -LX to extend one line past the
end of file. For example, given a file with 5 lines, -L6 is accepted as
valid. Demonstrate this problem.

While here, also add tests to check that the remaining cases of X and Y
in -LX,Y are handled correctly at and in the vicinity of end-of-file.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
 t/annotate-tests.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 3524eaf..02fbbf1 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -225,10 +225,32 @@ test_expect_success 'blame -L /RE/,-N' '
 	check_count -L/99/,-3 B 1 B2 1 D 1
 '
 
+# 'file' ends with an incomplete line, so 'wc' reports one fewer lines than
+# git-blame sees, hence the last line is actually $(wc...)+1.
+test_expect_success 'blame -L X (X == nlines)' '
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n C 1
+'
+
+test_expect_failure 'blame -L X (X == nlines + 1)' '
+	n=$(expr $(wc -l <file) + 2) &&
+	test_must_fail $PROG -L$n file
+'
+
 test_expect_success 'blame -L X (X > nlines)' '
 	test_must_fail $PROG -L12345 file
 '
 
+test_expect_success 'blame -L ,Y (Y == nlines)' '
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+'
+
+test_expect_success 'blame -L ,Y (Y == nlines + 1)' '
+	n=$(expr $(wc -l <file) + 2) &&
+	test_must_fail $PROG -L,$n file
+'
+
 test_expect_success 'blame -L ,Y (Y > nlines)' '
 	test_must_fail $PROG -L,12345 file
 '
-- 
1.8.3.4.1120.gc240c48

  parent reply	other threads:[~2013-07-31  8:16 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-31  8:15 [PATCH 00/11] blame/log -L: additional tests and bug fixes Eric Sunshine
2013-07-31  8:15 ` [PATCH 01/11] t8001/t8002: blame: decompose overly-large test Eric Sunshine
2013-07-31  8:15 ` Eric Sunshine [this message]
2013-08-05 19:29   ` [PATCH 02/11] t8001/t8002: blame: demonstrate -L bounds checking bug Junio C Hamano
2013-08-05 19:35     ` Eric Sunshine
2013-08-05 19:45       ` Eric Sunshine
2013-08-05 23:30         ` Junio C Hamano
2013-07-31  8:15 ` [PATCH 03/11] t8001/t8002: blame: add empty file & partial-line tests Eric Sunshine
2013-07-31  8:15 ` [PATCH 04/11] blame: fix -L bounds checking bug Eric Sunshine
2013-07-31  8:15 ` [PATCH 05/11] t4211: log: demonstrate " Eric Sunshine
2013-07-31  8:15 ` [PATCH 06/11] t4211: retire soon-to-be unimplementable tests Eric Sunshine
2013-07-31  8:15 ` [PATCH 07/11] log: fix -L bounds checking bug Eric Sunshine
2013-07-31  8:15 ` [PATCH 08/11] t8001/t8002: blame: demonstrate acceptance of bogus -LX,+0 and -LX,-0 Eric Sunshine
2013-07-31  8:15 ` [PATCH 09/11] blame: reject empty ranges " Eric Sunshine
2013-07-31  8:15 ` [PATCH 10/11] t8001/t8002: blame: demonstrate acceptance of bogus -L,+0 and -L,-0 Eric Sunshine
2013-07-31  8:15 ` [PATCH 11/11] blame: reject empty ranges " Eric Sunshine
2013-08-03 14:41 ` [PATCH 00/11] blame/log -L: additional tests and bug fixes Thomas Rast

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1375258545-42240-3-git-send-email-sunshine@sunshineco.com \
    --to=sunshine@sunshineco.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j.sixt@viscovery.net \
    --cc=struggleyb.nku@gmail.com \
    --cc=trast@inf.ethz.ch \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).