diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 10:36:42 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 10:36:42 +0000 |
| commit | a50f85f6cbaa47f2910796d797810b0a59ee0012 (patch) | |
| tree | 9d32c2d7837913b842b4f7259c69b31f6fd9699a /transcode.c | |
| parent | ef72effc0c46312af745fb268e9bb764ee600bfe (diff) | |
merges r23773 from trunk into ruby_1_9_1.
--
* transcode.c (enc_arg): default interanl encoding may not be set.
[ruby-core:23932]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/transcode.c b/transcode.c index 18ddd5fd4f..7eb2220ccf 100644 --- a/transcode.c +++ b/transcode.c @@ -2394,13 +2394,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); } |