diff options
| author | Dmitri Smirnov <dmitrism@microsoft.com> | 2016-02-29 22:30:19 (GMT) |
|---|---|---|
| committer | Jason Evans <je@fb.com> | 2016-02-29 23:22:53 (GMT) |
| commit | 33184bf69813087bf1885b0993685f9d03320c69 (patch) | |
| tree | bfe57a8fff05ab4d61a582f7bf1bb2096ab3c070 /test/unit | |
| parent | 0e1d5c25c677064ed81e3ec0f88b52f835557171 (diff) | |
| download | jemalloc-33184bf69813087bf1885b0993685f9d03320c69.zip jemalloc-33184bf69813087bf1885b0993685f9d03320c69.tar.gz jemalloc-33184bf69813087bf1885b0993685f9d03320c69.tar.bz2 | |
Fix stack corruption and uninitialized var warning
Stack corruption happens in x64 bit
This resolves #347.
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/hash.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/unit/hash.c b/test/unit/hash.c index f50ba81..010c9d7 100644 --- a/test/unit/hash.c +++ b/test/unit/hash.c @@ -64,14 +64,15 @@ static void hash_variant_verify_key(hash_variant_t variant, uint8_t *key) { const int hashbytes = hash_variant_bits(variant) / 8; - VARIABLE_ARRAY(uint8_t, hashes, hashbytes * 256); + const int hashes_size = hashbytes * 256; + VARIABLE_ARRAY(uint8_t, hashes, hashes_size); VARIABLE_ARRAY(uint8_t, final, hashbytes); unsigned i; uint32_t computed, expected; memset(key, 0, KEY_SIZE); - memset(hashes, 0, sizeof(hashes)); - memset(final, 0, sizeof(final)); + memset(hashes, 0, hashes_size); + memset(final, 0, hashbytes); /* * Hash keys of the form {0}, {0,1}, {0,1,2}, ..., {0,1,...,255} as the @@ -102,17 +103,17 @@ hash_variant_verify_key(hash_variant_t variant, uint8_t *key) /* Hash the result array. */ switch (variant) { case hash_variant_x86_32: { - uint32_t out = hash_x86_32(hashes, hashbytes*256, 0); + uint32_t out = hash_x86_32(hashes, hashes_size, 0); memcpy(final, &out, sizeof(out)); break; } case hash_variant_x86_128: { uint64_t out[2]; - hash_x86_128(hashes, hashbytes*256, 0, out); + hash_x86_128(hashes, hashes_size, 0, out); memcpy(final, out, sizeof(out)); break; } case hash_variant_x64_128: { uint64_t out[2]; - hash_x64_128(hashes, hashbytes*256, 0, out); + hash_x64_128(hashes, hashes_size, 0, out); memcpy(final, out, sizeof(out)); break; } default: not_reached(); |