summaryrefslogtreecommitdiff
path: root/ext/openssl/ossl.c
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-14 05:05:17 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-14 05:05:17 +0000
commit2235b8c36d2ef508cf132a3c2079d2e2dc2d32ae (patch)
tree5c099a5e76fbc1ef69abef59f114e4d2376c77dd /ext/openssl/ossl.c
parenta87ff1d339aa88c52b812bb63d0edac694519eb6 (diff)
* 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
Diffstat (limited to 'ext/openssl/ossl.c')
-rw-r--r--ext/openssl/ossl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 36a7aa5..133b4e3 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));
}