From 52c74c8a47c7303a63a60c4fe31936a093312def 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: http://svn.ruby-lang.org/repos/ruby/trunk@7550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/openssl/ossl.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49362f5f5..88ca3576e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 14 14:03:57 2004 GOTOU Yuuzou + + * ext/openssl/ossl.c (ossl_raise): avoid buffer overrun. + [ruby-dev:25187] + Tue Dec 14 08:47:45 2004 Yukihiro Matsumoto * eval.c (Init_eval): should mark ruby_eval_tree. [ruby-dev:25189] diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index 36a7aa504..133b4e30c 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