add test for secp160r1

[openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index 46a00697ce22147579763fa5b9bb55bb1cb9980b..57f295877d1abc5e5c8c55267470709e04712578 100644 (file)
--- 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,12 +345,15 @@ 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);
        if(ret)
                memcpy(ret,str,old_len);
-       memset(str,'\0',old_len);
+       OPENSSL_cleanse(str,old_len);
        free_func(str);
 #ifdef LEVITTE_DEBUG_MEM
        fprintf(stderr, "LEVITTE_DEBUG_MEM:         | 0x%p -> 0x%p (%d)\n", str, ret, num);