naruse	2008-01-13 01:34:08 +0900 (Sun, 13 Jan 2008)

  New Revision: 15008

  Modified files:
    trunk/encoding.c

  Log:
    * encoding.c (rb_enc_aliases): don't see enc_table_alias when it wasn't initialized yet.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=15008&r2=15007&diff_format=u

Index: encoding.c
===================================================================
--- encoding.c	(revision 15007)
+++ encoding.c	(revision 15008)
@@ -999,7 +999,7 @@
 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 @@
 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;
 }

--
ML: ruby-changes@q...
Info: