mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t-prio-queue: check result array bounds

Browse Source 
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>
This commit is contained in:
René Scharfe
2024-03-16 22:09:47 +01:00
committed by Junio C Hamano
parent e6f9cb76ea
commit 30ff05094c
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
t/unit-tests/t-prio-queue.c
View File

@ -19,11 +19,13 @@ static int show(int *v)
return v ? *v : MISSING; 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 }; 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; void *peek, *get;
switch(input[i]) { switch(input[i]) {
case GET: case GET:
@ -31,6 +33,8 @@ static void test_prio_queue(int *input, int *result, size_t input_size)
get = prio_queue_get(&pq); get = prio_queue_get(&pq);
if (!check(peek == get)) if (!check(peek == get))
return; return;
if (!check_uint(j, <, result_size))
break;
if (!check_int(result[j], ==, show(get))) if (!check_int(result[j], ==, show(get)))
test_msg(" j: %d", j); test_msg(" j: %d", j);
j++; j++;
@ -40,6 +44,8 @@ static void test_prio_queue(int *input, int *result, size_t input_size)
get = prio_queue_get(&pq); get = prio_queue_get(&pq);
if (!check(peek == get)) if (!check(peek == get))
return; return;
if (!check_uint(j, <, result_size))
break;
if (!check_int(result[j], ==, show(get))) if (!check_int(result[j], ==, show(get)))
test_msg(" j: %d", j); test_msg(" j: %d", j);
j++; j++;
@ -56,6 +62,7 @@ static void test_prio_queue(int *input, int *result, size_t input_size)
break; break;
} }
} }
check_uint(j, ==, result_size);
clear_prio_queue(&pq); 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 input[] = {INPUT}; \
int result[] = {RESULT}; \ 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) TEST_INPUT(BASIC_INPUT, BASIC_RESULT, basic)