QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-27 20:27:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use calloc() instead of malloc()+memset()

Browse Source
This commit is contained in:
Frank Denis
2016-02-19 07:40:09 +01:00
parent 11caf90c1f
commit 80d24c00cc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_pwhash/argon2/argon2-core.c
+3 -2
View File
@@ -101,17 +101,19 @@ static int allocate_memory(block_region **region, uint32_t m_cost) {
base = NULL; /* LCOV_EXCL_LINE */
}
memcpy(&memory, &base, sizeof memory);
memset(memory, 0, memory_size);
#elif defined(HAVE_POSIX_MEMALIGN)
if ((errno = posix_memalign((void **) &base, 64, memory_size)) != 0) {
base = NULL;
}
memcpy(&memory, &base, sizeof memory);
memset(memory, 0, memory_size);
#else
memory = NULL;
if (memory_size + 63 < memory_size) {
base = NULL;
errno = ENOMEM;
} else if ((base = malloc(memory_size + 63)) != NULL) {
} else if ((base = calloc(memory_size + 63, (size_t) 1U)) != NULL) {
uint8_t *aligned = ((uint8_t *) base) + 63;
aligned -= (uintptr_t) aligned & 63;
memcpy(&memory, &aligned, sizeof memory);
@@ -123,7 +125,6 @@ static int allocate_memory(block_region **region, uint32_t m_cost) {
(*region)->base = base;
(*region)->memory = memory;
(*region)->size = base ? memory_size : 0;
memset(memory, 0, memory_size);
return ARGON2_OK;
}