* eval.c (method_arity): should handle NODE_BMETHOD and

matz · matz · commit 2e71945d0468 · 2004-10-24T23:37:23.000Z
NODE_DMETHOD. [ruby-core:01138]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@7110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -54,6 +54,11 @@ Sat Jun 28 12:28:46 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* gc.c (Init_stack): add safety margin.
 
+Sat Jun 14 17:59:59 2003  Guy Decoux  <ts@moulon.inra.fr>
+
+	* eval.c (method_arity): should handle NODE_BMETHOD and
+	  NODE_DMETHOD. [ruby-core:01138]
+
 Fri May 30 11:25:58 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* lib/irb/xmp.rb: sync with 1.8 ("irb/irb" -> "irb").
diff --git a/eval.c b/eval.c
@@ -6827,6 +6827,9 @@ method_arity(method)
 	return INT2FIX(1);
       case NODE_IVAR:
 	return INT2FIX(0);
+      case NODE_BMETHOD:
+      case NODE_DMETHOD:
+       return proc_arity(method);
       default:
 	body = body->nd_next;	/* skip NODE_SCOPE */
 	if (nd_type(body) == NODE_BLOCK)
diff --git a/io.c b/io.c
@@ -2184,7 +2184,8 @@ rb_io_puts(argc, argv, out)
 	    line = rb_obj_as_string(argv[i]);
 	}
 	rb_io_write(out, line);
-	if (RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
+	if (RSTRING(line)->len == 0 ||
+            RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
 	    rb_io_write(out, rb_default_rs);
 	}
     }
diff --git a/lib/cgi.rb b/lib/cgi.rb
@@ -823,13 +823,15 @@ def read_multipart(boundary, content_length)
           end
 
           c = if bufsize < content_length
-                stdinput.read(bufsize) or ''
+                stdinput.read(bufsize)
               else
-                stdinput.read(content_length) or ''
+                stdinput.read(content_length)
               end
+          if c.nil?
+            raise EOFError, "bad content body"
+          end
           buf += c
           content_length -= c.size
-
         end
 
         buf = buf.sub(/\A((?:.|\n)*?)(?:#{EOL})?#{boundary}(#{EOL}|--)/n) do

Original file line number	Diff line number	Diff line change
`@@ -2184,7 +2184,8 @@ rb_io_puts(argc, argv, out)`
`2184`	`2184`	`line = rb_obj_as_string(argv[i]);`
`2185`	`2185`	`}`
`2186`	`2186`	`rb_io_write(out, line);`
`2187`		`- if (RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {`
	`2187`	`+ if (RSTRING(line)->len == 0 \|\|`
	`2188`	`+ RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {`
`2188`	`2189`	`rb_io_write(out, rb_default_rs);`
`2189`	`2190`	`}`
`2190`	`2191`	`}`