From 4261dd6ab742eea969df5da3e2ce94a75759efe2 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 12 Jan 2008 16:34:08 +0000 Subject: * encoding.c (rb_enc_aliases): don't see enc_table_alias when it wasn't initialized yet. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encoding.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'encoding.c') diff --git a/encoding.c b/encoding.c index b9e69617ea..c62e32b3d7 100644 --- a/encoding.c +++ b/encoding.c @@ -999,7 +999,7 @@ rb_enc_name_list(VALUE klass) static int rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg) { - rb_hash_aset((VALUE)arg, rb_str_new2((char *)name), rb_enc_name(rb_enc_from_index((int)orig))); + rb_hash_aset((VALUE)arg, rb_str_new2((char *)name), rb_str_new2(rb_enc_name(rb_enc_from_index((int)orig)))); return 0; } @@ -1014,7 +1014,7 @@ static VALUE rb_enc_aliases(VALUE klass) { VALUE aliases = rb_hash_new(); - st_foreach(enc_table_alias, rb_enc_aliases_enc_i, (st_data_t)aliases); + if (enc_table_alias) st_foreach(enc_table_alias, rb_enc_aliases_enc_i, (st_data_t)aliases); st_foreach(enc_table_alias_name, rb_enc_aliases_str_i, (st_data_t)aliases); return aliases; } -- cgit v1.2.3