diff --git a/ChangeLog b/ChangeLog
index 46e2aa56bb..c473d7a701 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat May 28 02:06:26 2011  KOSAKI Motohiro  <kosaki@KOSAKI-Motohiro-no-MacBook-Pro.local>
+
+	* io.c (fill_cbuf): Fix test-all crash.
+
 Sat May 28 00:58:40 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* lib/ostruct.rb (method_missing): Handle [] and []= correctly.
diff --git a/io.c b/io.c
index bf06eaaecb..20d526dfe0 100644
--- a/io.c
+++ b/io.c
@@ -1715,11 +1715,12 @@ 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;
+		    break;
                 }
             }
         }
     }
+    return MORE_CHAR_FINISHED;
 }
 
 static VALUE