cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use assignement + case instead of memcpy()

Browse Source
This commit is contained in:
Frank Denis 2021-06-17 20:56:54 +02:00
parent 94daa0e15a
commit 95673e5b51
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsodium/crypto_pwhash/argon2/argon2-core.c
View File

@ -76,7 +76,7 @@ static int allocate_memory(block_region **region, uint32_t m_cost);
static int static int
allocate_memory(block_region **region, uint32_t m_cost) allocate_memory(block_region **region, uint32_t m_cost)
{ {
void * base; void *base;
block *memory; block *memory;
size_t memory_size; size_t memory_size;
@ -99,12 +99,12 @@ allocate_memory(block_region **region, uint32_t m_cost)
-1, 0)) == MAP_FAILED) { -1, 0)) == MAP_FAILED) {
base = NULL; /* LCOV_EXCL_LINE */ base = NULL; /* LCOV_EXCL_LINE */
} /* LCOV_EXCL_LINE */ } /* LCOV_EXCL_LINE */
memcpy(&memory, &base, sizeof memory); memory = (block *) base;
#elif defined(HAVE_POSIX_MEMALIGN) #elif defined(HAVE_POSIX_MEMALIGN)
if ((errno = posix_memalign((void **) &base, 64, memory_size)) != 0) { if ((errno = posix_memalign((void **) &base, 64, memory_size)) != 0) {
base = NULL; base = NULL;
} }
memcpy(&memory, &base, sizeof memory); memory = (block *) base;
#else #else
memory = NULL; memory = NULL;
if (memory_size + 63 < memory_size) { if (memory_size + 63 < memory_size) {
@ -113,7 +113,7 @@ allocate_memory(block_region **region, uint32_t m_cost)
} else if ((base = malloc(memory_size + 63)) != NULL) { } else if ((base = malloc(memory_size + 63)) != NULL) {
uint8_t *aligned = ((uint8_t *) base) + 63; uint8_t *aligned = ((uint8_t *) base) + 63;
aligned -= (uintptr_t) aligned & 63; aligned -= (uintptr_t) aligned & 63;
memcpy(&memory, &aligned, sizeof memory); memory = (block *) aligned;
} }
#endif #endif
if (base == NULL) { if (base == NULL) {