Commit e1be1dce authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Leak fixes. 



Fix error path leaks in a2i_ASN1_STRING(), a2i_ASN1_INTEGER() and
a2i_ASN1_ENUMERATED().

Thanks to Shi Lei for reporting these issues.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 32baafb2

crypto/asn1/f_enum.c

+2 −2
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size) 
                                                      i * 2);

            if (sp == NULL) {

                ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, ERR_R_MALLOC_FAILURE);

                if (s != NULL)

                    OPENSSL_free(s);

                goto err;

            }

            s = sp;
@@ -199,5 +197,7 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size) 
 err_sl:

        ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, ASN1_R_SHORT_LINE);

    }

    if (ret != 1)

        OPENSSL_free(s);

    return (ret);

}

crypto/asn1/f_int.c

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,6 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size) 
                sp = OPENSSL_realloc_clean(s, slen, num + i * 2);

            if (sp == NULL) {

                ASN1err(ASN1_F_A2I_ASN1_INTEGER, ERR_R_MALLOC_FAILURE);

                if (s != NULL)

                    OPENSSL_free(s);

                goto err;

            }

            s = sp;
@@ -211,5 +209,7 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size) 
 err_sl:

        ASN1err(ASN1_F_A2I_ASN1_INTEGER, ASN1_R_SHORT_LINE);

    }

    if (ret != 1)

        OPENSSL_free(s);

    return (ret);

}

crypto/asn1/f_string.c

+2 −2
Original line number Diff line number Diff line
@@ -166,8 +166,6 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size) 
                                                      i * 2);

            if (sp == NULL) {

                ASN1err(ASN1_F_A2I_ASN1_STRING, ERR_R_MALLOC_FAILURE);

                if (s != NULL)

                    OPENSSL_free(s);

                goto err;

            }

            s = sp;
@@ -205,5 +203,7 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size) 
 err_sl:

        ASN1err(ASN1_F_A2I_ASN1_STRING, ASN1_R_SHORT_LINE);

    }

    if (ret != 1)

        OPENSSL_free(s);

    return (ret);

}