2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ed3ba62ada..14298013c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 27 22:38:54 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (fill_cbuf): finish reading at EOF.
+
 Fri May 27 11:31:51 2011  misfo <tedwardo2@gmail.com>
 
 	* lib/rexml/text.rb (REXML::Text#initialize): prevent an error
diff --git a/io.c b/io.c
index 053c161e53..00f4ea62fa 100644
--- a/io.c
+++ b/io.c
@@ -1715,6 +1715,7 @@ fill_cbuf(rb_io_t *fptr, int ec_flags)
                     res = rb_econv_convert(fptr->readconv, NULL, NULL, &dp, de, 0);
                     fptr->cbuf.len += (int)(dp - ds);
                     rb_econv_check_error(fptr->readconv);
+                    break;
                 }
             }
         }