From 92496d73eb68bcdd062251a7fb2cb994e0086780 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 14 Apr 2010 06:58:13 +0000 Subject: * 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 --- ChangeLog | 5 +++++ string.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ccd728c1db..1989eaca1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 14 15:58:11 2010 Nobuyoshi Nakada + + * string.c (rb_string_value_cstr): make NUL terminated if it is + not done. + Wed Apr 14 12:56:21 2010 Shugo Maeda * lib/net/imap (encode_utf7): encode & properly. Thanks, Kengo diff --git a/string.c b/string.c index 1186b3b81b..e3d890cae3 100644 --- a/string.c +++ b/string.c @@ -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; } -- cgit v1.2.3