Make sodium_malloc(0) well-defined. It always returns NULL.

This commit is contained in:
Frank Denis
2016-03-25 09:44:41 +01:00
parent 02e4b3b842
commit eb13ec0cff
2 changed files with 5 additions and 2 deletions
+2 -2
View File
@@ -577,8 +577,8 @@ sodium_malloc(const size_t size)
{
void *ptr;
if ((ptr = _sodium_malloc(size)) == NULL) {
return NULL; /* LCOV_EXCL_LINE */
if (size == (size_t) 0 || (ptr = _sodium_malloc(size)) == NULL) {
return NULL;
}
memset(ptr, (int) GARBAGE_VALUE, size);
+3
View File
@@ -39,6 +39,9 @@ int main(void)
if (sodium_malloc(SIZE_MAX - 1U) != NULL) {
return 1;
}
if (sodium_malloc(0U) != NULL) {
return 1;
}
if (sodium_allocarray(SIZE_MAX / 2U + 1U, SIZE_MAX / 2U) != NULL) {
return 1;
}