import OpenSSL-1.0.1c

1 files changed, 6 insertions, 0 deletions

diff --git a/src/lib/libcrypto/mem.c b/src/lib/libcrypto/mem.c
index 6f80dd33eb..21c0011380 100644
--- a/src/lib/libcrypto/mem.c
+++ b/src/lib/libcrypto/mem.c
@@ -125,6 +125,7 @@ static long (*get_debug_options_func)(void) = NULL;
 int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
         void (*f)(void *))
         {
+        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;
@@ -361,6 +363,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);