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 /error.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 'error.c')
-rw-r--r-- | error.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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); |