summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-24 22:00:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-24 22:00:55 +0000
commit7a6113d6b683ab671e2476910962fbfd5e689617 (patch)
tree8c984feab222fa6fd2e75751c577a206c544520c
parent68823fdea5ea47cf056c95b4e45c48c66f55c157 (diff)
* string.c (rb_string_value_cstr): rb_str_modify can change
RSTRING_PTR. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/-test-/string/cstr.c20
-rw-r--r--string.c6
-rw-r--r--test/-ext-/string/test_cstr.rb17
4 files changed, 47 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 87c36e3..5f37016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c
new file mode 100644
index 0000000..d4ff360
--- /dev/null
+++ b/ext/-test-/string/cstr.c
@@ -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);
+}
diff --git a/string.c b/string.c
index 4e0d9fd..9e9d911 100644
--- a/string.c
+++ b/string.c
@@ -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;
}
diff --git a/test/-ext-/string/test_cstr.rb b/test/-ext-/string/test_cstr.rb
new file mode 100644
index 0000000..8c0bb13
--- /dev/null
+++ b/test/-ext-/string/test_cstr.rb
@@ -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