git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 05/11] t4211: log: demonstrate -L bounds checking bug

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jul 31, 2013, 08:15 UTC
Message-ID
<1375258545-42240-6-git-send-email-sunshine@sunshineco.com>
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/t4211-line-log.sh | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 7665d67..f98275c 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -64,6 +64,36 @@ test_bad_opts "-L 1,1000:b.c" "has only.*lines"
 test_bad_opts "-L :b.c" "argument.*not of the form"
 test_bad_opts "-L :foo:b.c" "no match"
 
+test_expect_success '-L X (X == nlines)' '
+	n=$(wc -l <b.c) &&
+	git log -L $n:b.c
+'
+
+test_expect_failure '-L X (X == nlines + 1)' '
+	n=$(expr $(wc -l <b.c) + 1) &&
+	test_must_fail git log -L $n:b.c
+'
+
+test_expect_success '-L X (X == nlines + 2)' '
+	n=$(expr $(wc -l <b.c) + 2) &&
+	test_must_fail git log -L $n:b.c
+'
+
+test_expect_success '-L ,Y (Y == nlines)' '
+	n=$(printf "%d" $(wc -l <b.c)) &&
+	git log -L ,$n:b.c
+'
+
+test_expect_success '-L ,Y (Y == nlines + 1)' '
+	n=$(expr $(wc -l <b.c) + 1) &&
+	test_must_fail git log -L ,$n:b.c
+'
+
+test_expect_success '-L ,Y (Y == nlines + 2)' '
+	n=$(expr $(wc -l <b.c) + 2) &&
+	test_must_fail git log -L ,$n:b.c
+'
+
 # 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
 # non-empty -L range.
-- 
1.8.3.4.1120.gc240c48
Previous: Eric SunshineNext: Eric Sunshine
Message 10 of 17 in “blame/log -L: additional tests and bug fixes”
  1. 00/11 blame/log -L: additional tests and bug fixesEric Sunshine, Jul 31, 2013
  2. 01/11 t8001/t8002: blame: decompose overly-large testEric Sunshine, Jul 31, 2013
  3. 02/11 t8001/t8002: blame: demonstrate -L bounds checking bugEric Sunshine, Jul 31, 2013
  4. Junio C HamanoAug 5, 2013
  5. Eric SunshineAug 5, 2013
  6. Eric SunshineAug 5, 2013
  7. Junio C HamanoAug 5, 2013
  8. 03/11 t8001/t8002: blame: add empty file & partial-line testsEric Sunshine, Jul 31, 2013
  9. 04/11 blame: fix -L bounds checking bugEric Sunshine, Jul 31, 2013
  10. 05/11 t4211: log: demonstrate -L bounds checking bugEric Sunshine, Jul 31, 2013
  11. 06/11 t4211: retire soon-to-be unimplementable testsEric Sunshine, Jul 31, 2013
  12. 07/11 log: fix -L bounds checking bugEric Sunshine, Jul 31, 2013
  13. 08/11 t8001/t8002: blame: demonstrate acceptance of bogus -LX,+0 and -LX,-0Eric Sunshine, Jul 31, 2013
  14. 09/11 blame: reject empty ranges -LX,+0 and -LX,-0Eric Sunshine, Jul 31, 2013
  15. 10/11 t8001/t8002: blame: demonstrate acceptance of bogus -L,+0 and -L,-0Eric Sunshine, Jul 31, 2013
  16. 11/11 blame: reject empty ranges -L,+0 and -L,-0Eric Sunshine, Jul 31, 2013
  17. Thomas RastAug 3, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.