From 3448160b248e92b2c0c2a39ba42a9d9c366b4e72 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 21 Jun 2009 01:46:37 +0000 Subject: [PATCH] * transcode.c (enc_arg): default interanl encoding may not be set. [ruby-core:23932] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ transcode.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cf4489cdb..10f711de39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 21 10:46:32 2009 Nobuyoshi Nakada + + * transcode.c (enc_arg): default interanl encoding may not be set. + [ruby-core:23932] + Sat Jun 20 21:11:43 2009 Tadayoshi Funaba * numeric.c (num_div): don't use num_floor which is actually diff --git a/transcode.c b/transcode.c index 7fb25601fc..ee6794d9be 100644 --- a/transcode.c +++ b/transcode.c @@ -2470,13 +2470,13 @@ enc_arg(volatile VALUE *arg, const char **name_p, rb_encoding **enc_p) int encidx; VALUE encval; - if ((encidx = rb_to_encoding_index(encval = *arg)) < 0) { + if (((encidx = rb_to_encoding_index(encval = *arg)) < 0) || + !(enc = rb_enc_from_index(encidx))) { enc = NULL; encidx = 0; n = StringValueCStr(*arg); } else { - enc = rb_enc_from_index(encidx); n = rb_enc_name(enc); }