diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-09-12 15:40:57 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-09-12 22:49:03 +0900 |
commit | 598d66f6b2d1ab34dcd6db3bed70c59836a6206a (patch) | |
tree | 9bd09233ff30729eef29a1cbed86acca6caf715a /ext/openssl/ossl.c | |
parent | c7dce12eb9e07f6ae35fc767760b862c10317e11 (diff) |
[ruby/openssl] Separate formatting from ossl_make_error
Just append OpenSSL error reason to the given message string
object, which would be alreadly formatted.
Suppress -Wformat-security warning in `ossl_tsfac_create_ts`.
https://github.com/ruby/openssl/commit/11b1d8a6b8
Diffstat (limited to 'ext/openssl/ossl.c')
-rw-r--r-- | ext/openssl/ossl.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index 91cb54bfbe..f214bcb522 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -265,20 +265,14 @@ ossl_to_der_if_possible(VALUE obj) return obj; } -PRINTF_ARGS(static VALUE ossl_make_error(VALUE exc, const char *fmt, va_list args), 2, 0); - /* * Errors */ -static VALUE -ossl_make_error(VALUE exc, const char *fmt, va_list args) +VALUE +ossl_make_error(VALUE exc, VALUE str) { - VALUE str = Qnil; unsigned long e; - if (fmt) { - str = rb_vsprintf(fmt, args); - } e = ERR_peek_last_error(); if (e) { const char *msg = ERR_reason_error_string(e); @@ -302,10 +296,17 @@ ossl_raise(VALUE exc, const char *fmt, ...) { va_list args; VALUE err; - va_start(args, fmt); - err = ossl_make_error(exc, fmt, args); - va_end(args); - rb_exc_raise(err); + + if (fmt) { + va_start(args, fmt); + err = rb_vsprintf(fmt, args); + va_end(args); + } + else { + err = Qnil; + } + + rb_exc_raise(ossl_make_error(exc, err)); } void |