diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-20 01:08:13 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-20 01:08:13 +0000 |
| commit | 7617c58b71a00a8c447b606bd95539a791e02d7b (patch) | |
| tree | 699d9b7a26df8a792c0358c6409240d233193dfe /object.c | |
| parent | f9f8b167d6eeb2b41d61e5f9ee91b98f9a74ea19 (diff) | |
| download | ruby-7617c58b71a00a8c447b606bd95539a791e02d7b.tar.gz ruby-7617c58b71a00a8c447b606bd95539a791e02d7b.tar.xz ruby-7617c58b71a00a8c447b606bd95539a791e02d7b.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@8807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'object.c')
| -rw-r--r-- | object.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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); } |