From: Richard Levitte <levitte@openssl.org>
Date: Wed, 19 Feb 2003 11:54:42 +0000 (+0000)
Subject: Make sure the memory allocation routines check for negative sizes
X-Git-Tag: BEN_FIPS_TEST_1~38^2~296
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d5234c7b3a4ebcd6dcc31a042838d90a27b57c82;p=oweals%2Fopenssl.git

Make sure the memory allocation routines check for negative sizes
---

diff --git a/crypto/mem.c b/crypto/mem.c
index d7d3cda5dc..57f295877d 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -252,6 +252,8 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line)
 	void *ret = NULL;
 	extern unsigned char cleanse_ctr;
 
+	if (num < 0) return NULL;
+
 	allow_customize = 0;
 	if (malloc_debug_func != NULL)
 		{
@@ -291,6 +293,8 @@ void *CRYPTO_malloc(int num, const char *file, int line)
 	void *ret = NULL;
 	extern unsigned char cleanse_ctr;
 
+	if (num < 0) return NULL;
+
 	allow_customize = 0;
 	if (malloc_debug_func != NULL)
 		{
@@ -319,6 +323,9 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line)
 
 	if (str == NULL)
 		return CRYPTO_malloc(num, file, line);
+
+	if (num < 0) return NULL;
+
 	if (realloc_debug_func != NULL)
 		realloc_debug_func(str, NULL, num, file, line, 0);
 	ret = realloc_ex_func(str,num,file,line);
@@ -338,6 +345,9 @@ void *CRYPTO_realloc_clean(void *str, int old_len, int num, const char *file,
 
 	if (str == NULL)
 		return CRYPTO_malloc(num, file, line);
+
+	if (num < 0) return NULL;
+
 	if (realloc_debug_func != NULL)
 		realloc_debug_func(str, NULL, num, file, line, 0);
 	ret=malloc_ex_func(num,file,line);