]> granicus.if.org Git - openssl/commit
Use sk_CONF_VALUE_pop_free in do_ext_nconf error path.
authorDavid Benjamin <davidben@google.com>
Tue, 26 Jul 2016 15:36:23 +0000 (11:36 -0400)
committerRich Salz <rsalz@openssl.org>
Tue, 26 Jul 2016 20:03:42 +0000 (16:03 -0400)
commite125c12f5718cf589b3469aa40a54421a2536bd2
tree5db5971d2ae45f86a6d160336c119d9ad29c8b53
parentabdb0c7b4ec73d6e94d4d8a0d6ee027e3b8db428
Use sk_CONF_VALUE_pop_free in do_ext_nconf error path.

8605abf13523579ecab8b1f2a4bcb8354d94af79 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: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1351)
crypto/x509v3/v3_conf.c