From 64093366d68bc88efc4be3ada0f8668997f36632 Mon Sep 17 00:00:00 2001 From: Ankit Kekre Date: Thu, 13 Mar 2025 21:29:54 +0530 Subject: [PATCH] apps/cms.c, apps/ocsp.c: Added NULL pointer checks Reviewed-by: Paul Dale Reviewed-by: Tim Hudson Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/27059) (cherry picked from commit 952d9b83b20359e9ed0fff8f18a84add29949f6f) --- apps/cms.c | 2 +- apps/ocsp.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/cms.c b/apps/cms.c index b1ce8a8bd0a..0b0bc949c98 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -1013,7 +1013,7 @@ int cms_main(int argc, char **argv) goto end; pctx = CMS_RecipientInfo_get0_pkey_ctx(ri); - if (kparam != NULL) { + if (pctx != NULL && kparam != NULL) { if (!cms_set_pkey_param(pctx, kparam->param)) goto end; } diff --git a/apps/ocsp.c b/apps/ocsp.c index 97454a4b81d..11af0a3a6fc 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -1049,6 +1049,10 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req } bs = OCSP_BASICRESP_new(); + if (bs == NULL) { + *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR, bs); + goto end; + } thisupd = X509_gmtime_adj(NULL, 0); if (ndays != -1) nextupd = X509_time_adj_ex(NULL, ndays, nmin * 60, NULL); -- 2.47.2