nobu	2008-07-21 10:25:55 +0900 (Mon, 21 Jul 2008)

  New Revision: 18140

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18140

  Log:
    * io.c (prepare_getline_args): check if rs is a string when non-nil
      lim is given.  [ruby-dev:35610]

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18139)
+++ ChangeLog	(revision 18140)
@@ -1,3 +1,8 @@
+Mon Jul 21 10:25:52 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (prepare_getline_args): check if rs is a string when non-nil
+	  lim is given.  [ruby-dev:35610]
+
 Mon Jul 21 04:55:20 2008  Tanaka Akira  <akr@f...>
 
 	* dir.c (dir_initialize): use rb_convert_type instead of
Index: io.c
===================================================================
--- io.c	(revision 18139)
+++ io.c	(revision 18140)
@@ -1892,7 +1892,10 @@
     }
     else {
 	rb_scan_args(argc, argv, "11", &rs, &lim);
-	if (NIL_P(lim) && !NIL_P(rs) && TYPE(rs) != T_STRING) {
+	if (!NIL_P(lim)) {
+	    StringValue(rs);
+	}
+	else if (!NIL_P(rs) && TYPE(rs) != T_STRING) {
 	    VALUE tmp = rb_check_string_type(rs);
 
 	    if (NIL_P(tmp)) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/