From 08dc317502511db1d0d48fa51742aa8bbb58e8de Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Tue, 14 Dec 2004 05:05:17 +0000 Subject: * ext/openssl/ossl.c (ossl_raise): avoid buffer overrun. [ruby-dev:25187] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/ossl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/openssl') diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index 36a7aa5042..133b4e30ca 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -285,17 +285,17 @@ ossl_raise(VALUE exc, const char *fmt, ...) va_start(args, fmt); len = vsnprintf(buf, BUFSIZ, fmt, args); va_end(args); - len += snprintf(buf+len, BUFSIZ-len, ": "); } - if (e) { + if (len < BUFSIZ && e) { if (dOSSL == Qtrue) /* FULL INFO */ msg = ERR_error_string(e, NULL); else msg = ERR_reason_error_string(e); ERR_clear_error(); - len += snprintf(buf+len, BUFSIZ-len, "%s", msg); + len += snprintf(buf+len, BUFSIZ-len, ": %s", msg); } + if(len > BUFSIZ) len = strlen(buf); rb_exc_raise(rb_exc_new(exc, buf, len)); } -- cgit v1.2.3