Commit 62f488d3 authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Richard Levitte
Browse files

Fix the error handling in CRYPTO_dup_ex_data. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2998)
parent 144ab9b2

crypto/ex_data.c

+3 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static int int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, 
                           CRYPTO_EX_DATA *from)

{

    int mx, j, i;

    char *ptr;

    void *ptr;

    CRYPTO_EX_DATA_FUNCS **storage = NULL;

    EX_CLASS_ITEM *item;

    if (!from->sk)
@@ -473,6 +473,8 @@ static int int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, 
    if (j < mx)

        mx = j;

    if (mx > 0) {

        if (!CRYPTO_set_ex_data(to, mx - 1, NULL))

            goto skip;

        storage = OPENSSL_malloc(mx * sizeof(CRYPTO_EX_DATA_FUNCS *));

        if (!storage)

            goto skip;