diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-18 00:23:18 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-18 00:23:18 +0000 |
commit | 231ab57f6f4cae9b81ce9eaf15f670479413ecf2 (patch) | |
tree | 8cc811e869dcb8f7b175640816d0f433f114b98c /encoding.c | |
parent | f7929ed206a0c2a7296ce415b259f29837e639e5 (diff) |
* parse.y (parser_initialize): explicitly call rb_ascii8bit_encoding().
* parse.y (parser_prepare): lex_input may not be have encoding (e.g. IO).
* parse.y (rb_parser_compile_string): set encoding from input string.
* encoding.c (rb_enc_find_index): use ASCII-8BIT if loading known
encoding failed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r-- | encoding.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c index 1453b267b2..38d2cf2c90 100644 --- a/encoding.c +++ b/encoding.c @@ -498,6 +498,12 @@ rb_enc_find_index(const char *name) } else { i = load_encoding(name); + enc = rb_enc_from_index(i); + if (!enc->precise_mbc_enc_len) { + rb_warn("failed to load encoding (%s); use ASCII-8BIT instead", + name); + return 0; + } } } return i; |