[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  f5d97098a4c5d1c91887a3f2e0a31c1e20ca32e3 (commit)
      from  679d87515d23ca31491effdc264edc81c695a72a (commit)


- Log -----------------------------------------------------------------
commit f5d97098a4c5d1c91887a3f2e0a31c1e20ca32e3
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Tue Dec 22 11:26:39 2015 +0100

    Also change the non-debug versions to use size_t
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    MR: #1518

-----------------------------------------------------------------------

Summary of changes:
 crypto/mem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/mem.c b/crypto/mem.c
index 0c8f4e1..7ecf0ae 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -120,8 +120,8 @@ static long (*get_debug_options_func) (void) = CRYPTO_dbg_get_options;
  * applications can use CRYPTO_malloc_debug_init() to select above case at
  * run-time
  */
-static void (*malloc_debug_func) (void *, int, const char *, int, int) = NULL;
-static void (*realloc_debug_func) (void *, void *, int, const char *, int,
+static void (*malloc_debug_func) (void *, size_t, const char *, int, int) = NULL;
+static void (*realloc_debug_func) (void *, void *, size_t, const char *, int,
                                    int)
     = NULL;
 static void (*free_debug_func) (void *, int) = NULL;