* encoding.c (rb_filesystem_encindex): avoid infinite require

loop. [ruby-core:30467] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
iain · May 29, 2010 · 2f9d028 · 2f9d028
1 parent 8e9f308
commit 2f9d028
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 29 12:56:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_filesystem_encindex): avoid infinite require
+	  loop. [ruby-core:30467]
+
 Sat May 29 12:05:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/rdoc.rb (RDoc#read_file_contents): take care of BOM.

diff --git a/encoding.c b/encoding.c
@@ -1160,7 +1160,7 @@ rb_filesystem_encindex(void)
 {
     int idx = rb_enc_registered("filesystem");
     if (idx < 0)
-	idx = enc_set_filesystem_encoding();
+	idx = rb_ascii8bit_encindex();
     return idx;
 }