From 9f9ace81f8cd7624f1cefb8c2b9af1fbba72af90 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 11 Apr 2010 03:08:51 +0000 Subject: [PATCH] * encoding.c (enc_replicate): new encoding name must be valid c-string. [ruby-dev:40954] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ encoding.c | 2 +- test/ruby/test_encoding.rb | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7e158f6440..234bfee16e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Apr 11 12:08:49 2010 Nobuyoshi Nakada + + * encoding.c (enc_replicate): new encoding name must be valid + c-string. [ruby-dev:40954] + Sun Apr 11 11:58:23 2010 Nobuyoshi Nakada * include/ruby/win32.h (ftruncate): rename to get rid of conflict diff --git a/encoding.c b/encoding.c index 0e26376121..f4df3a09e2 100644 --- a/encoding.c +++ b/encoding.c @@ -326,7 +326,7 @@ static VALUE enc_replicate(VALUE encoding, VALUE name) { return rb_enc_from_encoding_index( - rb_enc_replicate(RSTRING_PTR(name), + rb_enc_replicate(StringValueCStr(name), rb_to_encoding(encoding))); } diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index 600101a59c..6d36db9cf0 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -54,6 +54,7 @@ class TestEncoding < Test::Unit::TestCase def test_replicate assert(Encoding::UTF_8.replicate('UTF-8-ANOTHER')) assert(Encoding::ISO_2022_JP.replicate('ISO-2022-JP-ANOTHER')) + assert_raise(TypeError, bug3127 = '[ruby-dev:40954]') {Encoding::UTF_8.replicate(0)} end def test_dummy_p