Fix modes.h so that indent doesn't complain

[openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index 6f80dd33eb740a3822390bae39a40fa7d40d1e80..01052cfa38e9a562a4301cce3bd6a36a9877d91a 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -121,10 +121,11 @@ static void (*set_debug_options_func)(long) = NULL;
 static long (*get_debug_options_func)(void) = NULL;
 #endif
 
-
 int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
        void (*f)(void *))
        {
+       /* Dummy call just to ensure OPENSSL_init() gets linked in */
+       OPENSSL_init();
        if (!allow_customize)
                return 0;
        if ((m == 0) || (r == 0) || (f == 0))
@@ -186,6 +187,7 @@ int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
        {
        if (!allow_customize_debug)
                return 0;
+       OPENSSL_init();
        malloc_debug_func=m;
        realloc_debug_func=r;
        free_debug_func=f;
@@ -253,10 +255,12 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line)
 
        if (num <= 0) return NULL;
 
-       allow_customize = 0;
+       if(allow_customize)
+               allow_customize = 0;
        if (malloc_debug_func != NULL)
                {
-               allow_customize_debug = 0;
+               if(allow_customize_debug)
+                       allow_customize_debug = 0;
                malloc_debug_func(NULL, num, file, line, 0);
                }
        ret = malloc_locked_ex_func(num,file,line);
@@ -297,10 +301,12 @@ void *CRYPTO_malloc(int num, const char *file, int line)
 
        if (num <= 0) return NULL;
 
-       allow_customize = 0;
+       if(allow_customize)
+               allow_customize = 0;
        if (malloc_debug_func != NULL)
                {
-               allow_customize_debug = 0;
+               if(allow_customize_debug)
+                       allow_customize_debug = 0;
                malloc_debug_func(NULL, num, file, line, 0);
                }
        ret = malloc_ex_func(num,file,line);
@@ -361,6 +367,10 @@ void *CRYPTO_realloc_clean(void *str, int old_len, int num, const char *file,
 
        if (num <= 0) return NULL;
 
+       /* We don't support shrinking the buffer. Note the memcpy that copies
+        * |old_len| bytes to the new buffer, below. */
+       if (num < old_len) return NULL;
+
        if (realloc_debug_func != NULL)
                realloc_debug_func(str, NULL, num, file, line, 0);
        ret=malloc_ex_func(num,file,line);