* ext/openssl/ossl.c (ossl_raise): avoid buffer overrun. [ruby-dev:25187]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 49362f5f5f..88ca3576eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 14 14:03:57 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl.c (ossl_raise): avoid buffer overrun.
+          [ruby-dev:25187]
+
 Tue Dec 14 08:47:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* 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 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));
 }