diff options
| author | Tomas Mraz <tomas@openssl.org> | 2022-03-28 19:13:22 +0200 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2022-04-03 12:58:05 +1000 |
| commit | 327a720d5dd011b853acbdd0223933f6ecd22928 (patch) | |
| tree | 0ef3586815ffaf4baea8606b9a2dc7b089d4ca49 /crypto/params.c | |
| parent | d1592f21c0d4c2c94a8c6004cf7b5cad2dcb2637 (diff) | |
OSSL_PARAM_get_*_ptr: Drop errors from ptr/string mismatch
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17997)
Diffstat (limited to 'crypto/params.c')
| -rw-r--r-- | crypto/params.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/crypto/params.c b/crypto/params.c index a1a04a6b4d..321b919ccc 100644 --- a/crypto/params.c +++ b/crypto/params.c @@ -1506,14 +1506,25 @@ static int get_string_ptr_internal(const OSSL_PARAM *p, const void **val, int OSSL_PARAM_get_utf8_string_ptr(const OSSL_PARAM *p, const char **val) { - return OSSL_PARAM_get_utf8_ptr(p, val) - || get_string_ptr_internal(p, (const void **)val, NULL, - OSSL_PARAM_UTF8_STRING); + int rv; + + ERR_set_mark(); + rv = OSSL_PARAM_get_utf8_ptr(p, val); + ERR_pop_to_mark(); + + return rv || get_string_ptr_internal(p, (const void **)val, NULL, + OSSL_PARAM_UTF8_STRING); } int OSSL_PARAM_get_octet_string_ptr(const OSSL_PARAM *p, const void **val, size_t *used_len) { - return OSSL_PARAM_get_octet_ptr(p, val, used_len) - || get_string_ptr_internal(p, val, used_len, OSSL_PARAM_OCTET_STRING); + int rv; + + ERR_set_mark(); + rv = OSSL_PARAM_get_octet_ptr(p, val, used_len); + ERR_pop_to_mark(); + + return rv || get_string_ptr_internal(p, val, used_len, + OSSL_PARAM_OCTET_STRING); } |