undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-hashmap: use ALLOC_ARRAY rather than bare malloc

Browse Source 
These two array allocations have several minor flaws:

  - they use bare malloc, rather than our error-checking
    xmalloc

  - they do a bare multiplication to determine the total
    size (which in theory can overflow, though in this case
    the sizes are all constants)

  - they use sizeof(type), but the type in the second one
    doesn't match the actual array (though it's "int" versus
    "unsigned int", which are guaranteed by C99 to have the
    same size)

None of these are likely to be problems in practice, and
this is just a test helper. But since people often look at
test helpers as reference code, we should do our best to
model the recommended techniques.

Switching to ALLOC_ARRAY fixes all three.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2018-02-14 13:05:46 -05:00 committed by Junio C Hamano
parent 3013dff866
commit aef6cf1e50
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/helper/test-hashmap.c
View File

@ -85,8 +85,8 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
unsigned int *hashes; unsigned int *hashes;
unsigned int i, j; unsigned int i, j;
entries = malloc(TEST_SIZE * sizeof(struct test_entry *)); ALLOC_ARRAY(entries, TEST_SIZE);
hashes = malloc(TEST_SIZE * sizeof(int)); ALLOC_ARRAY(hashes, TEST_SIZE);
for (i = 0; i < TEST_SIZE; i++) { for (i = 0; i < TEST_SIZE; i++) {
snprintf(buf, sizeof(buf), "%i", i); snprintf(buf, sizeof(buf), "%i", i);
entries[i] = alloc_test_entry(0, buf, strlen(buf), "", 0); entries[i] = alloc_test_entry(0, buf, strlen(buf), "", 0);