From eadc6bbb9c472589020a25a94d306610a1d76af5 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 12 Feb 2018 17:43:38 +0000 Subject: [PATCH] The function X509_gmtime_adj() can fail Check for a failure and free a_tm as appropriate. Found by Coverity Reviewed-by: Bernd Edlinger (Merged from https://github.com/openssl/openssl/pull/5339) (cherry picked from commit bc2a0dd283c0f61df572b8c2aaf3bfc2dd4b7571) --- apps/ca.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/ca.c b/apps/ca.c index 633f6e3363..efa2ca84e3 100644 --- a/apps/ca.c +++ b/apps/ca.c @@ -1095,13 +1095,13 @@ end_of_options: goto end; tmptm = ASN1_TIME_new(); - if (tmptm == NULL) - goto end; - X509_gmtime_adj(tmptm, 0); - X509_CRL_set1_lastUpdate(crl, tmptm); - if (!X509_time_adj_ex(tmptm, crldays, crlhours * 60 * 60 + crlsec, - NULL)) { + if (tmptm == NULL + || X509_gmtime_adj(tmptm, 0) == NULL + || !X509_CRL_set1_lastUpdate(crl, tmptm) + || X509_time_adj_ex(tmptm, crldays, crlhours * 60 * 60 + crlsec, + NULL) == NULL) { BIO_puts(bio_err, "error setting CRL nextUpdate\n"); + ASN1_TIME_free(tmptm); goto end; } X509_CRL_set1_nextUpdate(crl, tmptm); @@ -2215,7 +2215,10 @@ static int do_updatedb(CA_DB *db) return -1; /* get actual time and make a string */ - a_tm = X509_gmtime_adj(a_tm, 0); + if (X509_gmtime_adj(a_tm, 0) == NULL) { + ASN1_UTCTIME_free(a_tm); + return -1; + } a_tm_s = app_malloc(a_tm->length + 1, "time string"); memcpy(a_tm_s, a_tm->data, a_tm->length); -- 2.25.1