diff options
| author | Matt Caswell <matt@openssl.org> | 2019-10-11 17:42:19 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-11-14 09:29:21 +0000 |
| commit | b3f3ba7011c9afa3ac3b5ebf0c7462fb6ddee2cd (patch) | |
| tree | 43d346c8c865bd710365e0c67305f9d045539355 /crypto/params.c | |
| parent | 10e7216e502916f8e7917ac4f21411fffd1fb882 (diff) | |
Allow setting a NULL pointer in a params structure
Sometimes it is valid to send a NULL pointer in params.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10152)
Diffstat (limited to 'crypto/params.c')
| -rw-r--r-- | crypto/params.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crypto/params.c b/crypto/params.c index 0cd13e3b81..58a4710e47 100644 --- a/crypto/params.c +++ b/crypto/params.c @@ -892,9 +892,8 @@ int OSSL_PARAM_set_utf8_ptr(OSSL_PARAM *p, const char *val) if (p == NULL) return 0; p->return_size = 0; - if (val == NULL) - return 0; - return set_ptr_internal(p, val, OSSL_PARAM_UTF8_PTR, strlen(val) + 1); + return set_ptr_internal(p, val, OSSL_PARAM_UTF8_PTR, + val == NULL ? 0 : strlen(val) + 1); } int OSSL_PARAM_set_octet_ptr(OSSL_PARAM *p, const void *val, @@ -903,8 +902,6 @@ int OSSL_PARAM_set_octet_ptr(OSSL_PARAM *p, const void *val, if (p == NULL) return 0; p->return_size = 0; - if (val == NULL) - return 0; return set_ptr_internal(p, val, OSSL_PARAM_OCTET_PTR, used_len); } |