summaryrefslogtreecommitdiffstats
path: root/encoding.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-18 00:23:18 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-18 00:23:18 +0000
commitbf4b9ba49e350a38dac7199cadc54f2fda94d98b (patch)
tree8cc811e869dcb8f7b175640816d0f433f114b98c /encoding.c
parenta5598ceb26cac304656200e41b12fb66f584587d (diff)
downloadruby-bf4b9ba49e350a38dac7199cadc54f2fda94d98b.tar.gz
ruby-bf4b9ba49e350a38dac7199cadc54f2fda94d98b.tar.xz
ruby-bf4b9ba49e350a38dac7199cadc54f2fda94d98b.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@15099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c
index 1453b267b..38d2cf2c9 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;