Commit e125c12f authored by David Benjamin's avatar David Benjamin Committed by Rich Salz
Browse files

Use sk_CONF_VALUE_pop_free in do_ext_nconf error path. 



8605abf1 fixed the nval leak, but it
used free instead of pop_free. nval owns its contents, so it should be
freed with pop_free. See the pop_free call a few lines down.

This is a no-op as, in this codepath, we must have nval == NULL or
sk_CONF_VALUE_num(nval) == 0. In those cases, free and pop_free are
identical. However, variables should be freed consistently.

Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1351)
parent abdb0c7b

crypto/x509v3/v3_conf.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid, 
            ERR_add_error_data(4, "name=", OBJ_nid2sn(ext_nid), ",section=",

                               value);

            if (*value != '@')

                sk_CONF_VALUE_free(nval);

                sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);

            return NULL;

        }

        ext_struc = method->v2i(method, ctx, nval);