From e3c1b48ba25e97967a5f27869653af05fad90dd2 Mon Sep 17 00:00:00 2001
From: Yukihiro Matsumoto <matz@ruby-lang.org>
Date: Thu, 31 May 2012 11:14:33 +0900
Subject: mrb_gets_args strict argc check; now returns argc

---
 src/class.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/class.c b/src/class.c
index fa349a015..f96922f4b 100644
--- a/src/class.c
+++ b/src/class.c
@@ -398,10 +398,16 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
     sp = a->buf;
   }
   while ((c = *format++)) {
-    if (argc < i) {
-      if (opt) continue;
-      mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+    switch (c) {
+    case '|': case '*': case '&':
+      break;
+    default:
+      if (argc <= i) {
+	if (opt) continue;
+	mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+      }
     }
+
     switch (c) {
     case 'o':
       {
@@ -556,6 +562,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
     case '|':
       opt = 1;
       break;
+
     case '*':
       {
         mrb_value **var;
@@ -569,6 +576,8 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
 	    *var = sp;
             i = argc;
           }
+	  i = argc;
+	  sp += *pl;
         }
         else {
           *pl = 0;
@@ -582,7 +591,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
     mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
   }
   va_end(ap);
-  return 0;
+  return i;
 }
 
 static struct RClass*
-- 
cgit v1.2.3