* variable.c (rb_class_path): need to adjust snprintf() len for

  teminating NUL.  [ruby-dev:26581]

* error.c (syserr_initialize): don't use str before StringValue()
  check.  [ruby-dev:26579]


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

1 files changed, 4 insertions, 2 deletions

diff --git a/error.c b/error.c
index d21f990ae9..f35dc2ba3e 100644
--- a/error.c
+++ b/error.c
@@ -956,12 +956,14 @@ syserr_initialize(argc, argv, self)
     else err = "unknown error";
     if (!NIL_P(mesg)) {
 	VALUE str = mesg;
-	size_t len = strlen(err)+RSTRING(str)->len+3;
+	size_t len;
+
 	StringValue(str);
+	len = strlen(err)+RSTRING(str)->len+3;
 	mesg = rb_str_new(0, len);
 	snprintf(RSTRING(mesg)->ptr, len+1, "%s - %.*s", err,
 		(int)RSTRING(str)->len, RSTRING(str)->ptr);
-	rb_str_resize(mesg, strlen(RSTRING(mesg)->ptr));
+	RSTRING(mesg)->len = strlen(RSTRING(mesg)->ptr);
     }
     else {
 	mesg = rb_str_new2(err);