shyouhei	2009-02-17 11:59:26 +0900 (Tue, 17 Feb 2009)

  New Revision: 22366

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22366

  Log:
    merge revision(s) 20354:
    * string.c (str_independent): no independent string points null_str.
      [ruby-core:20082]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/string.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22365)
+++ ruby_1_8_7/ChangeLog	(revision 22366)
@@ -1,3 +1,8 @@
+Tue Feb 17 11:58:58 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (str_independent): no independent string points null_str.
+	  [ruby-core:20082]
+
 Mon Feb 16 23:30:24 2009  Hidetoshi NAGAI  <nagai@a...>
 
 	* ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb: 
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22365)
+++ ruby_1_8_7/version.h	(revision 22366)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-02-16"
+#define RUBY_RELEASE_DATE "2009-02-17"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090216
-#define RUBY_PATCHLEVEL 122
+#define RUBY_RELEASE_CODE 20090217
+#define RUBY_PATCHLEVEL 123
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #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[];
Index: ruby_1_8_7/string.c
===================================================================
--- ruby_1_8_7/string.c	(revision 22365)
+++ ruby_1_8_7/string.c	(revision 22366)
@@ -471,6 +471,8 @@
     return rb_str_format(1, &arg, str);
 }
 
+static const char null_str[] = "";
+
 static int
 str_independent(str)
     VALUE str;
@@ -481,6 +483,7 @@
     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;
 }
@@ -539,7 +542,6 @@
     return Qfalse;
 }
 
-static const char null_str[] = "";
 #define make_null_str(s) do { \
 	FL_SET(s, ELTS_SHARED); \
 	RSTRING(s)->ptr = (char *)null_str; \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/