kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* string.c (rb_string_value_cstr): rb_str_modify can change

Browse source 
RSTRING_PTR.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-01-24 22:00:55 +00:00
parent 68823fdea5
commit 7a6113d6b6
4 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Jan 25 07:00:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_string_value_cstr): rb_str_modify can change
RSTRING_PTR.
Tue Jan 25 03:24:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* test/ruby/test_thread.rb: Added various ConditionVariable tests.

20
ext/-test-/string/cstr.c Normal file
View file

@ -0,0 +1,20 @@
#include "ruby.h"
static VALUE
bug_str_cstr_term(VALUE str)
{
long len;
char *s;
rb_str_modify(str);
len = RSTRING_LEN(str);
RSTRING_PTR(str)[len] = 'x';
s = StringValueCStr(str);
rb_gc();
return INT2NUM(s[len]);
}
void
Init_cstr(VALUE klass)
{
rb_define_method(klass, "cstr_term", bug_str_cstr_term, 0);
}

6
string.c
View file

@ -1392,7 +1392,11 @@ rb_string_value_cstr(volatile VALUE *ptr)
if (!s || memchr(s, 0, len)) {
rb_raise(rb_eArgError, "string contains null byte");
}
if (s[len]) rb_str_modify(str);
if (s[len]) {
rb_str_modify(str);
s = RSTRING_PTR(str);
s[RSTRING_LEN(str)] = 0;
}
return s;
}

17
test/-ext-/string/test_cstr.rb Normal file
View file

@ -0,0 +1,17 @@
require 'test/unit'
require "-test-/string/string"
class Test_StringCStr < Test::Unit::TestCase
Bug4319 = '[ruby-dev:43094]'
def test_embed
s = Bug::String.new("abcdef")
s.set_len(3)
assert_equal(0, s.cstr_term, Bug4319)
end
def test_long
s = Bug::String.new("abcdef")*100000
assert_equal(0, s.cstr_term, Bug4319)
end
end