From 2201229b4aebd2ebb08eae05ff197f0adfd4f4e5 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 20 Jul 2005 01:08:13 +0000 Subject: * 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 --- object.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'object.c') diff --git a/object.c b/object.c index 332b22fc61..af8f289f46 100644 --- a/object.c +++ b/object.c @@ -301,9 +301,9 @@ rb_any_to_s(obj) size_t len; VALUE str; - len = strlen(cname)+6+16+1; - str = rb_str_new(0, len); /* 6:tags 16:addr 1:nul */ - snprintf(RSTRING(str)->ptr, len, "#<%s:0x%lx>", cname, obj); + len = strlen(cname)+6+16; + str = rb_str_new(0, len); /* 6:tags 16:addr */ + snprintf(RSTRING(str)->ptr, len+1, "#<%s:0x%lx>", cname, obj); RSTRING(str)->len = strlen(RSTRING(str)->ptr); if (OBJ_TAINTED(obj)) OBJ_TAINT(str); @@ -389,9 +389,9 @@ rb_obj_inspect(obj) char *c; c = rb_obj_classname(obj); - len = strlen(c)+10+16+1; - str = rb_str_new(0, len); /* 10:tags 16:addr 1:nul */ - snprintf(RSTRING(str)->ptr, len, "-<%s:0x%lx", c, obj); + len = strlen(c)+10+16; + str = rb_str_new(0, len); /* 10:tags 16:addr */ + snprintf(RSTRING(str)->ptr, len+1, "-<%s:0x%lx", c, obj); RSTRING(str)->len = strlen(RSTRING(str)->ptr); return rb_exec_recursive(inspect_obj, obj, str); } -- cgit v1.2.3