CRYPTO_malloc(), CRYPTO_realloc() and variants of them should return NULL
if the give size is 0. This is a thought that came up in PR 751.
This commit is contained in:
parent
0bf1c1d80d
commit
6781efb92f
@ -252,7 +252,7 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line)
|
|||||||
void *ret = NULL;
|
void *ret = NULL;
|
||||||
extern unsigned char cleanse_ctr;
|
extern unsigned char cleanse_ctr;
|
||||||
|
|
||||||
if (num < 0) return NULL;
|
if (num <= 0) return NULL;
|
||||||
|
|
||||||
allow_customize = 0;
|
allow_customize = 0;
|
||||||
if (malloc_debug_func != NULL)
|
if (malloc_debug_func != NULL)
|
||||||
@ -293,7 +293,7 @@ void *CRYPTO_malloc(int num, const char *file, int line)
|
|||||||
void *ret = NULL;
|
void *ret = NULL;
|
||||||
extern unsigned char cleanse_ctr;
|
extern unsigned char cleanse_ctr;
|
||||||
|
|
||||||
if (num < 0) return NULL;
|
if (num <= 0) return NULL;
|
||||||
|
|
||||||
allow_customize = 0;
|
allow_customize = 0;
|
||||||
if (malloc_debug_func != NULL)
|
if (malloc_debug_func != NULL)
|
||||||
@ -324,7 +324,7 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line)
|
|||||||
if (str == NULL)
|
if (str == NULL)
|
||||||
return CRYPTO_malloc(num, file, line);
|
return CRYPTO_malloc(num, file, line);
|
||||||
|
|
||||||
if (num < 0) return NULL;
|
if (num <= 0) return NULL;
|
||||||
|
|
||||||
if (realloc_debug_func != NULL)
|
if (realloc_debug_func != NULL)
|
||||||
realloc_debug_func(str, NULL, num, file, line, 0);
|
realloc_debug_func(str, NULL, num, file, line, 0);
|
||||||
@ -346,7 +346,7 @@ void *CRYPTO_realloc_clean(void *str, int old_len, int num, const char *file,
|
|||||||
if (str == NULL)
|
if (str == NULL)
|
||||||
return CRYPTO_malloc(num, file, line);
|
return CRYPTO_malloc(num, file, line);
|
||||||
|
|
||||||
if (num < 0) return NULL;
|
if (num <= 0) return NULL;
|
||||||
|
|
||||||
if (realloc_debug_func != NULL)
|
if (realloc_debug_func != NULL)
|
||||||
realloc_debug_func(str, NULL, num, file, line, 0);
|
realloc_debug_func(str, NULL, num, file, line, 0);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user