Commit 261ec72d authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Fix ASN1_TYPE_get/set with type=V_ASN1_BOOLEAN 



BOOLEAN does not have valid data in the value.ptr member,
thus don't use it here.

Fixes #9276

[extended tests]

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9278)

(cherry picked from commit 6335f837cfa7eaf1202f2557bf2ba148987226e7)
parent 3003d2db

crypto/asn1/a_type.c

+6 −2
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 


int ASN1_TYPE_get(const ASN1_TYPE *a)

{

    if ((a->value.ptr != NULL) || (a->type == V_ASN1_NULL))

    if (a->type == V_ASN1_BOOLEAN

            || a->type == V_ASN1_NULL

            || a->value.ptr != NULL)

        return a->type;

    else

        return 0;
@@ -23,7 +25,9 @@ int ASN1_TYPE_get(const ASN1_TYPE *a) 


void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value)

{

    if (a->value.ptr != NULL) {

    if (a->type != V_ASN1_BOOLEAN

            && a->type != V_ASN1_NULL

            && a->value.ptr != NULL) {

        ASN1_TYPE **tmp_a = &a;

        asn1_primitive_free((ASN1_VALUE **)tmp_a, NULL, 0);

    }