yugui	2011-01-28 11:25:44 +0900 (Fri, 28 Jan 2011)

  New Revision: 30694

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

  Log:
    merges r30648 from trunk into ruby_1_9_2.
    --
    * string.c (rb_string_value_cstr): rb_str_modify can change
      RSTRING_PTR.

  Added directories:
    branches/ruby_1_9_2/ext/-test-/string/
    branches/ruby_1_9_2/test/-ext-/string/
  Added files:
    branches/ruby_1_9_2/ext/-test-/string/cstr.c
    branches/ruby_1_9_2/test/-ext-/string/test_cstr.rb
  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/string.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30693)
+++ ruby_1_9_2/ChangeLog	(revision 30694)
@@ -1,3 +1,8 @@
+Tue Jan 25 07:00:52 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_string_value_cstr): rb_str_modify can change
+	  RSTRING_PTR.
+
 Tue Jan 25 07:48:22 2011  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* test/ruby/test_thread.rb: remove unused variables.
Index: ruby_1_9_2/string.c
===================================================================
--- ruby_1_9_2/string.c	(revision 30693)
+++ ruby_1_9_2/string.c	(revision 30694)
@@ -1381,7 +1381,11 @@
     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;
 }
 
Index: ruby_1_9_2/ext/-test-/string/cstr.c
===================================================================
--- ruby_1_9_2/ext/-test-/string/cstr.c	(revision 0)
+++ ruby_1_9_2/ext/-test-/string/cstr.c	(revision 30694)
@@ -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);
+}
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30693)
+++ ruby_1_9_2/version.h	(revision 30694)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 171
+#define RUBY_PATCHLEVEL 172
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/-ext-/string/test_cstr.rb
===================================================================
--- ruby_1_9_2/test/-ext-/string/test_cstr.rb	(revision 0)
+++ ruby_1_9_2/test/-ext-/string/test_cstr.rb	(revision 30694)
@@ -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

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