diff --git a/ChangeLog b/ChangeLog
index 7c3e425922..a903886650 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 18 15:26:50 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* error.c (rb_raise): workaround for some implementations of
+	  vsnprintf.
+
 Fri Apr 18 01:49:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* util.c (ruby_strtod): improved conversion accuracy.
diff --git a/error.c b/error.c
index 7befc7b8ee..e0c91f6746 100644
--- a/error.c
+++ b/error.c
@@ -595,6 +595,7 @@ rb_raise(exc, fmt, va_alist)
 
     va_init_list(args,fmt);
     vsnprintf(buf, BUFSIZ, fmt, args);
+    buf[BUFSIZ - 1] = '\0';
     va_end(args);
     rb_exc_raise(rb_exc_new2(exc, buf));
 }