diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-14 14:05:11 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-14 14:05:11 +0000 |
| commit | 21abf0ea3bf0fe26ddc9588f85807e5bda92e4fa (patch) | |
| tree | 297af384e1b902e78f531898f7514ef0099cc747 | |
| parent | 489e2fcd78dc2716b2505095026388d4eedee8e1 (diff) | |
| download | ruby-21abf0ea3bf0fe26ddc9588f85807e5bda92e4fa.tar.gz ruby-21abf0ea3bf0fe26ddc9588f85807e5bda92e4fa.tar.xz ruby-21abf0ea3bf0fe26ddc9588f85807e5bda92e4fa.zip | |
* transcode.c (str_transcode0): should not raise error when
default_internal is not set. [ruby-core:19309]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | transcode.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -45,6 +45,11 @@ Tue Oct 14 12:22:32 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * test/ruby/test_variable.rb (TestVariable#test_variable): add a test of [ruby-dev:36698]. +Tue Oct 14 11:14:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * transcode.c (str_transcode0): should not raise error when + default_internal is not set. [ruby-core:19309] + Tue Oct 14 11:14:26 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * lib/net/pop.rb: check for invalid APOP timestamp. (CVE-2007-1558) diff --git a/transcode.c b/transcode.c index 2a01fc9b9..6ef354446 100644 --- a/transcode.c +++ b/transcode.c @@ -2455,7 +2455,7 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts) if (argc == 0) { arg1 = rb_enc_default_internal(); if (NIL_P(arg1)) { - rb_raise(rb_eArgError, "Encoding.default_internal is not specified"); + return -1; } } else { |