From 1fac27050176f7ed00da5649266024265678f70c Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Mon, 19 Apr 2021 16:02:16 +0200 Subject: Fix potential NULL dereference in OSSL_PARAM_get_utf8_string() Fixes Coverity ID 1476283 Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14928) --- crypto/params.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'crypto/params.c') diff --git a/crypto/params.c b/crypto/params.c index 50e900a..d974363 100644 --- a/crypto/params.c +++ b/crypto/params.c @@ -1128,11 +1128,13 @@ int OSSL_PARAM_get_utf8_string(const OSSL_PARAM *p, char **val, size_t max_len) */ size_t data_length = p->data_size; + if (ret == 0) + return 0; if (data_length >= max_len) data_length = OPENSSL_strnlen(p->data, data_length); if (data_length >= max_len) return 0; /* No space for a terminating NUL byte */ - ((char *)*val)[data_length] = '\0'; + (*val)[data_length] = '\0'; return ret; } -- cgit v1.1