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_str_s_alloc, rb_str_replace): use null_str as well as

Browse source 
rb_string_value so that extension libraries do not segfault.
  [ruby-core:19971]

* string.c (rb_str_replace): reduced unnecessary malloc and copy.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@20287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-11-19 08:52:41 +00:00
parent 95aa5473c5
commit 23572d3cfa
2 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Nov 19 17:52:35 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_s_alloc, rb_str_replace): use null_str as well as
rb_string_value so that extension libraries do not segfault.
[ruby-core:19971]
* string.c (rb_str_replace): reduced unnecessary malloc and copy.
Wed Nov 19 03:13:36 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* test/rinda/test_rinda.rb: fixed fails occasionally [ruby-dev:37119].

39
string.c
View file

@ -313,6 +313,7 @@ rb_obj_as_string(obj)
return str;
}
static VALUE rb_str_s_alloc _((VALUE));
static VALUE rb_str_replace _((VALUE, VALUE));
VALUE
@ -539,7 +540,20 @@ rb_str_associated(str)
}
static const char null_str[] = "";
#define null_str ((char *)null_str)
#define make_null_str(s) do { \
FL_SET(s, ELTS_SHARED); \
RSTRING(s)->ptr = (char *)null_str; \
RSTRING(s)->aux.shared = 0; \
} while (0)
static VALUE
rb_str_s_alloc(klass)
VALUE klass;
{
VALUE str = str_alloc(klass);
make_null_str(str);
return str;
}
VALUE
rb_string_value(ptr)
@ -551,8 +565,7 @@ rb_string_value(ptr)
*ptr = s;
}
if (!RSTRING(s)->ptr) {
FL_SET(s, ELTS_SHARED);
RSTRING(s)->ptr = null_str;
make_null_str(s);
}
return s;
}
@ -583,8 +596,7 @@ rb_check_string_type(str)
{
str = rb_check_convert_type(str, T_STRING, "String", "to_str");
if (!NIL_P(str) && !RSTRING(str)->ptr) {
FL_SET(str, ELTS_SHARED);
RSTRING(str)->ptr = null_str;
make_null_str(str);
}
return str;
}
@ -2308,9 +2320,18 @@ rb_str_replace(str, str2)
RSTRING(str)->aux.shared = RSTRING(str2)->aux.shared;
}
else {
rb_str_modify(str);
rb_str_resize(str, RSTRING(str2)->len);
memcpy(RSTRING(str)->ptr, RSTRING(str2)->ptr, RSTRING(str2)->len);
if (str_independent(str)) {
rb_str_resize(str, RSTRING(str2)->len);
memcpy(RSTRING(str)->ptr, RSTRING(str2)->ptr, RSTRING(str2)->len);
if (!RSTRING(str)->ptr) {
make_null_str(str);
}
}
else {
RSTRING(str)->ptr = RSTRING(str2)->ptr;
RSTRING(str)->len = RSTRING(str2)->len;
str_make_independent(str);
}
if (FL_TEST(str2, STR_ASSOC)) {
FL_SET(str, STR_ASSOC);
RSTRING(str)->aux.shared = RSTRING(str2)->aux.shared;
@ -4908,7 +4929,7 @@ Init_String()
rb_cString = rb_define_class("String", rb_cObject);
rb_include_module(rb_cString, rb_mComparable);
rb_include_module(rb_cString, rb_mEnumerable);
rb_define_alloc_func(rb_cString, str_alloc);
rb_define_alloc_func(rb_cString, rb_str_s_alloc);
rb_define_method(rb_cString, "initialize", rb_str_init, -1);
rb_define_method(rb_cString, "initialize_copy", rb_str_replace, 1);
rb_define_method(rb_cString, "<=>", rb_str_cmp_m, 1);