提交 93863030 编写于 作者: M Matt Caswell

Make sure we free the CONF structure allocated by confdump

A travis build was failing because of a memory leak in confdump due to
us not freeing an allocated CONF structure.
Reviewed-by: NRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10429)
上级 985412f8
......@@ -51,10 +51,10 @@ static void dump_section(const char *name, const CONF *cnf)
int main(int argc, char **argv)
{
long eline;
CONF *conf;
CONF *conf = NCONF_new(NCONF_default());
int ret = 1;
if ((conf = NCONF_new(NCONF_default())) != NULL
&& NCONF_load(conf, argv[1], &eline)) {
if (conf != NULL && NCONF_load(conf, argv[1], &eline)) {
int i;
collect_all_sections(conf);
......@@ -62,9 +62,10 @@ int main(int argc, char **argv)
dump_section(sk_OPENSSL_CSTRING_value(section_names, i), conf);
}
sk_OPENSSL_CSTRING_free(section_names);
ret = 0;
} else {
ERR_print_errors_fp(stderr);
return 1;
}
return 0;
NCONF_free(conf);
return ret;
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册