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

merge revision(s) 20354:

Browse source 
* string.c (str_independent): no independent string points null_str.
	  [ruby-core:20082]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-02-17 02:58:28 +00:00
parent d2f1df77dd
commit 78b4827b10
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Feb 17 11:57:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (str_independent): no independent string points null_str.
[ruby-core:20082]
Mon Feb 16 23:25:43 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb:

4
string.c
View file

@ -464,6 +464,8 @@ rb_str_format_m(str, arg)
return rb_str_format(1, &arg, str);
}
static const char null_str[] = "";
static int
str_independent(str)
VALUE str;
@ -474,6 +476,7 @@ str_independent(str)
if (OBJ_FROZEN(str)) rb_error_frozen("string");
if (!OBJ_TAINTED(str) && rb_safe_level() >= 4)
rb_raise(rb_eSecurityError, "Insecure: can't modify string");
if (RSTRING(str)->ptr == null_str) return 0;
if (!FL_TEST(str, ELTS_SHARED)) return 1;
return 0;
}
@ -532,7 +535,6 @@ rb_str_associated(str)
return Qfalse;
}
static const char null_str[] = "";
#define make_null_str(s) do { \
FL_SET(s, ELTS_SHARED); \
RSTRING(s)->ptr = (char *)null_str; \

8
version.h
View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
#define RUBY_RELEASE_DATE "2009-02-16"
#define RUBY_RELEASE_DATE "2009-02-17"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20090216
#define RUBY_PATCHLEVEL 336
#define RUBY_RELEASE_CODE 20090217
#define RUBY_PATCHLEVEL 337
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 16
#define RUBY_RELEASE_DAY 17
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];