diff options
| author | René Scharfe <l.s.r@web.de> | 2024-03-16 22:09:47 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-18 09:25:54 -0700 |
| commit | 30ff05094c145397d88ead89c3937d1a058ed98a (patch) | |
| tree | f38e5ea72736f66ae6adcf03e3d48d142fb3deb1 | |
| parent | e6f9cb76ea14b955fb7b4fcb8dea0786b5b108d3 (diff) | |
| download | git-30ff05094c145397d88ead89c3937d1a058ed98a.tar.gz | |
t-prio-queue: check result array bounds
Avoid reading past the end of the "result" array, which could otherwise
happen if the prio-queue were to yield more items than were put into it
due to an implementation bug, or if the array has not enough entries due
to a test bug.
Also check at the end whether all "result" entries were consumed, which
would not be the case if the prio-queue forgot some entries or the test
definition contained too many.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/unit-tests/t-prio-queue.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/t/unit-tests/t-prio-queue.c b/t/unit-tests/t-prio-queue.c index 616d0fc86f..5358346361 100644 --- a/t/unit-tests/t-prio-queue.c +++ b/t/unit-tests/t-prio-queue.c @@ -19,11 +19,13 @@ static int show(int *v) return v ? *v : MISSING; } -static void test_prio_queue(int *input, int *result, size_t input_size) +static void test_prio_queue(int *input, size_t input_size, + int *result, size_t result_size) { struct prio_queue pq = { intcmp }; + int j = 0; - for (int i = 0, j = 0; i < input_size; i++) { + for (int i = 0; i < input_size; i++) { void *peek, *get; switch(input[i]) { case GET: @@ -31,6 +33,8 @@ static void test_prio_queue(int *input, int *result, size_t input_size) get = prio_queue_get(&pq); if (!check(peek == get)) return; + if (!check_uint(j, <, result_size)) + break; if (!check_int(result[j], ==, show(get))) test_msg(" j: %d", j); j++; @@ -40,6 +44,8 @@ static void test_prio_queue(int *input, int *result, size_t input_size) get = prio_queue_get(&pq); if (!check(peek == get)) return; + if (!check_uint(j, <, result_size)) + break; if (!check_int(result[j], ==, show(get))) test_msg(" j: %d", j); j++; @@ -56,6 +62,7 @@ static void test_prio_queue(int *input, int *result, size_t input_size) break; } } + check_uint(j, ==, result_size); clear_prio_queue(&pq); } @@ -79,7 +86,8 @@ static void test_prio_queue(int *input, int *result, size_t input_size) { \ int input[] = {INPUT}; \ int result[] = {RESULT}; \ - test_prio_queue(input, result, ARRAY_SIZE(input)); \ + test_prio_queue(input, ARRAY_SIZE(input), \ + result, ARRAY_SIZE(result)); \ } TEST_INPUT(BASIC_INPUT, BASIC_RESULT, basic) |