Commit 332dc4fa authored by Rich Salz's avatar Rich Salz
Browse files

sh_malloc & sh_free prototype change to match POSIX 



CLA: trivial

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2823)
parent 42f50fdf

crypto/mem_sec.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -52,8 +52,8 @@ static CRYPTO_RWLOCK *sec_malloc_lock = NULL; 
 * These are the functions that must be implemented by a secure heap (sh).

 * These are the functions that must be implemented by a secure heap (sh).

 */

 */

static int sh_init(size_t size, int minsize);

static int sh_init(size_t size, int minsize);

static char *sh_malloc(size_t size);

static void *sh_malloc(size_t size);

static void sh_free(char *ptr);

static void sh_free(void *ptr);

static void sh_done(void);

static void sh_done(void);

static size_t sh_actual_size(char *ptr);

static size_t sh_actual_size(char *ptr);

static int sh_allocated(const char *ptr);

static int sh_allocated(const char *ptr);
@@ -476,7 +476,7 @@ static char *sh_find_my_buddy(char *ptr, int list) 
    return chunk;

    return chunk;

}

}





static char *sh_malloc(size_t size)

static void *sh_malloc(size_t size)

{

{

    ossl_ssize_t list, slist;

    ossl_ssize_t list, slist;

    size_t i;

    size_t i;
@@ -535,10 +535,10 @@ static char *sh_malloc(size_t size) 
    return chunk;

    return chunk;

}

}





static void sh_free(char *ptr)

static void sh_free(void *ptr)

{

{

    size_t list;

    size_t list;

    char *buddy;

    void *buddy;





    if (ptr == NULL)

    if (ptr == NULL)

        return;

        return;