diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 01:46:37 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 01:46:37 +0000 |
| commit | 47ba3813f36c3a986f8031d9f1b8a8971aad8b7b (patch) | |
| tree | 1b3f0620472f84ad7cc5feae00a301747d4c30d8 /transcode.c | |
| parent | c5e54b97f606b2bb1c171f873e99b6a5fc83ed77 (diff) | |
| download | ruby-47ba3813f36c3a986f8031d9f1b8a8971aad8b7b.tar.gz ruby-47ba3813f36c3a986f8031d9f1b8a8971aad8b7b.tar.xz ruby-47ba3813f36c3a986f8031d9f1b8a8971aad8b7b.zip | |
* transcode.c (enc_arg): default interanl encoding may not be set.
[ruby-core:23932]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23773 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 7fb25601f..ee6794d9b 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); } |