diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-14 06:58:13 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-14 06:58:13 +0000 |
| commit | 09267569c310b879549e1d1d587ea547b42c007c (patch) | |
| tree | c0165721b5848b609af4fca007d3590c246ca1d4 /string.c | |
| parent | 9089c80d9932787ea5c965988f60e813035759a7 (diff) | |
* string.c (rb_string_value_cstr): make NUL terminated if it is
not done.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
| -rw-r--r-- | string.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -607,10 +607,12 @@ rb_string_value_cstr(ptr) { VALUE str = rb_string_value(ptr); char *s = RSTRING(str)->ptr; + long len = RSTRING(str)->len; - if (!s || RSTRING(str)->len != strlen(s)) { + if (!s || memchr(s, 0, len)) { rb_raise(rb_eArgError, "string contains null byte"); } + if (s[len]) rb_str_modify(str); return s; } |