summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--transcode.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e0131ad24b..25f13b3ead 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 2a01fc9b9a..6ef3544469 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 {