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 | 92496d73eb68bcdd062251a7fb2cb994e0086780 (patch) | |
tree | a0e6ebd8183023881dcc44fb046ecdeacd356528 | |
parent | 2587316c7370a666fb94e7100176533ae38990c1 (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/trunk@27337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Apr 14 15:58:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_string_value_cstr): make NUL terminated if it is + not done. + Wed Apr 14 12:56:21 2010 Shugo Maeda <shugo@ruby-lang.org> * lib/net/imap (encode_utf7): encode & properly. Thanks, Kengo @@ -1375,10 +1375,12 @@ rb_string_value_cstr(volatile VALUE *ptr) { VALUE str = rb_string_value(ptr); char *s = RSTRING_PTR(str); + long len = RSTRING_LEN(str); - if (!s || RSTRING_LEN(str) != (long)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; } |