Security fixes brought forward from 0.9.7.

[thirdparty/openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index a7826908e61ca9c3b4c562c15f6a22a77a00a5e7..03d2569bced7c0c0980551e02802f66deb7c4d54 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -305,7 +305,6 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line)
 
        if (str == NULL)
                return CRYPTO_malloc(num, file, line);
-
        if (realloc_debug_func != NULL)
                realloc_debug_func(str, NULL, num, file, line, 0);
        ret = realloc_ex_func(str,num,file,line);
@@ -318,6 +317,29 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line)
        return ret;
        }
 
+void *CRYPTO_realloc_clean(void *str, int old_len, int num, const char *file,
+                          int line)
+       {
+       void *ret = NULL;
+
+       if (str == NULL)
+               return CRYPTO_malloc(num, file, line);
+       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);
+       free_func(str);
+#ifdef LEVITTE_DEBUG_MEM
+       fprintf(stderr, "LEVITTE_DEBUG_MEM:         | 0x%p -> 0x%p (%d)\n", str, ret, num);
+#endif
+       if (realloc_debug_func != NULL)
+               realloc_debug_func(str, ret, num, file, line, 1);
+
+       return ret;
+       }
+
 void CRYPTO_free(void *str)
        {
        if (free_debug_func != NULL)
@@ -337,7 +359,6 @@ void *CRYPTO_remalloc(void *a, int num, const char *file, int line)
        return(a);
        }
 
-
 void CRYPTO_set_mem_debug_options(long bits)
        {
        if (set_debug_options_func != NULL)