ruby-changes:29866
From: nobu <ko1@a...>
Date: Thu, 11 Jul 2013 20:18:07 +0900 (JST)
Subject: [ruby-changes:29866] nobu:r41918 (trunk): string.c: check null char
nobu 2013-07-11 20:17:54 +0900 (Thu, 11 Jul 2013) New Revision: 41918 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41918 Log: string.c: check null char * string.c (rb_string_value_cstr): check null char in char, not in byte. Modified files: trunk/ChangeLog trunk/string.c trunk/test/-ext-/string/test_cstr.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 41917) +++ ChangeLog (revision 41918) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Thu Jul 11 20:17:51 2013 Nobuyoshi Nakada <nobu@r...> + + * string.c (rb_string_value_cstr): check null char in char, not in + byte. + Thu Jul 11 14:48:35 2013 Zachary Scott <e@z...> * array.c: Replace confusing example for #reverse_each in overview Index: string.c =================================================================== --- string.c (revision 41917) +++ string.c (revision 41918) @@ -1459,13 +1459,33 @@ rb_string_value_ptr(volatile VALUE *ptr) https://github.com/ruby/ruby/blob/trunk/string.c#L1459 return RSTRING_PTR(str); } +static const char * +str_null_char(const char *s, long len, rb_encoding *enc) +{ + int n; + const char *e = s + len; + + for (; s < e; s += n) { + if (!rb_enc_codepoint_len(s, e, &n, enc)) return s; + } + return 0; +} + char * rb_string_value_cstr(volatile VALUE *ptr) { VALUE str = rb_string_value(ptr); char *s = RSTRING_PTR(str); long len = RSTRING_LEN(str); + rb_encoding *enc = rb_enc_get(str); + const int minlen = rb_enc_mbminlen(enc); + if (minlen > 1) { + if (str_null_char(s, len, enc)) { + rb_raise(rb_eArgError, "string contains null char"); + } + } + else if (!s || memchr(s, 0, len)) { rb_raise(rb_eArgError, "string contains null byte"); } Index: test/-ext-/string/test_cstr.rb =================================================================== --- test/-ext-/string/test_cstr.rb (revision 41917) +++ test/-ext-/string/test_cstr.rb (revision 41918) @@ -14,4 +14,23 @@ class Test_StringCStr < Test::Unit::Test https://github.com/ruby/ruby/blob/trunk/test/-ext-/string/test_cstr.rb#L14 s = Bug::String.new("abcdef")*100000 assert_equal(0, s.cstr_term, Bug4319) end + + WCHARS = [Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE] + + def test_wchar_embed + WCHARS.each do |enc| + s = Bug::String.new("ab".encode(enc)) + assert_nothing_raised(ArgumentError) {s.cstr_term} + end + end + + def test_wchar_long + str = "abcdef" + n = 100 + len = str.size * n + WCHARS.each do |enc| + s = Bug::String.new(str.encode(enc))*n + assert_nothing_raised(ArgumentError) {s.cstr_term} + end + end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/