diff options
author | kinichiro <kinichiro.inoguchi@gmail.com> | 2019-12-11 21:12:53 +0900 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2019-12-13 13:39:31 +1000 |
commit | dd0139f416257ec5632414ed3ad8c61d07ba07ec (patch) | |
tree | e19d65a4f194c15a443bbace193dc3656762cbb6 | |
parent | ebe19ab86c0faf3f02b0c30d8da0d1cadb0fb33a (diff) |
Check return value after loading config file
CLA: trivial
Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10607)
-rw-r--r-- | apps/req.c | 6 | ||||
-rw-r--r-- | apps/ts.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/req.c b/apps/req.c index b084f108bd..76bbbeb555 100644 --- a/apps/req.c +++ b/apps/req.c @@ -476,12 +476,14 @@ int req_main(int argc, char **argv) if (verbose) BIO_printf(bio_err, "Using configuration from %s\n", template); - req_conf = app_load_config(template); + if ((req_conf = app_load_config(template)) == NULL) + goto end; if (addext_bio) { if (verbose) BIO_printf(bio_err, "Using additional configuration from command line\n"); - addext_conf = app_load_config_bio(addext_bio, NULL); + if ((addext_conf = app_load_config_bio(addext_bio, NULL)) == NULL) + goto end; } if (template != default_config_file && !app_load_modules(req_conf)) goto end; @@ -293,7 +293,8 @@ int ts_main(int argc, char **argv) goto end; } - conf = load_config_file(configfile); + if ((conf = load_config_file(configfile)) == NULL) + goto end; if (configfile != default_config_file && !app_load_modules(conf)) goto end; |