summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-19 13:52:42 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-19 13:52:42 +0000
commit54b583424a962bc98c3a3b711764b1b48fb604d2 (patch)
tree85cad8ae41d67cd7289de1893943f7ad0aaa5f8e
parentb598fbb3ec1afec26a352f88c894cc44067e4b2a (diff)
downloadruby-54b583424a962bc98c3a3b711764b1b48fb604d2.tar.gz
ruby-54b583424a962bc98c3a3b711764b1b48fb604d2.tar.xz
ruby-54b583424a962bc98c3a3b711764b1b48fb604d2.zip
* error.c (syserr_initialize): need to allocate an additional byte
for NUL at the end. [ruby-dev:26574] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--error.c2
-rw-r--r--eval.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b343b5776..ce51937e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 19 22:47:29 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * error.c (syserr_initialize): need to allocate an additional byte
+ for NUL at the end. [ruby-dev:26574]
+
Tue Jul 19 17:16:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* signal.c (trap): remove sigexit(); handle "EXIT" via sig_exec().
diff --git a/error.c b/error.c
index dc3ed1b35..347bacd5e 100644
--- a/error.c
+++ b/error.c
@@ -956,7 +956,7 @@ 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 = strlen(err)+RSTRING(str)->len+4;
StringValue(str);
mesg = rb_str_new(0, len);
snprintf(RSTRING(mesg)->ptr, len, "%s - %.*s", err,
diff --git a/eval.c b/eval.c
index eb5ea2758..182479095 100644
--- a/eval.c
+++ b/eval.c
@@ -8667,7 +8667,7 @@ proc_to_s(self)
NODE *node;
char *cname = rb_obj_classname(self);
const int w = (SIZEOF_LONG * CHAR_BIT) / 4;
- long len = strlen(cname)+6+w; /* 6:tags 16:addr */
+ long len = strlen(cname)+6+w+1; /* 6:tags 16:addr NUL */
VALUE str;
Data_Get_Struct(self, struct BLOCK, data);