Merge branch 'master' of http://github.com/mruby/mruby into alloc_doc

2 files changed, 7 insertions, 5 deletions

diff --git a/src/proc.c b/src/proc.c
index 4cb9ffe18..f98998f68 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -200,7 +200,7 @@ mrb_proc_arity(mrb_state *mrb, mrb_value self)
   struct RProc *p = mrb_proc_ptr(self);
   mrb_code *iseq = mrb_proc_iseq(mrb, p);
   mrb_aspec aspec;
-  int ma, ra, pa, arity;
+  int ma, op, ra, pa, arity;
 
   if (MRB_PROC_CFUNC_P(p)) {
     /* TODO cfunc aspec not implemented yet */
@@ -214,9 +214,10 @@ mrb_proc_arity(mrb_state *mrb, mrb_value self)
 
   aspec = GETARG_Ax(*iseq);
   ma = MRB_ASPEC_REQ(aspec);
+  op = MRB_ASPEC_OPT(aspec);
   ra = MRB_ASPEC_REST(aspec);
   pa = MRB_ASPEC_POST(aspec);
-  arity = ra ? -(ma + pa + 1) : ma + pa;
+  arity = ra || (MRB_PROC_STRICT_P(p) && op) ? -(ma + pa + 1) : ma + pa;
 
   return mrb_fixnum_value(arity);
 }
diff --git a/src/string.c b/src/string.c
index 0a28f2565..22a289ade 100644
--- a/src/string.c
+++ b/src/string.c
@@ -1985,7 +1985,8 @@ bad:
 MRB_API const char*
 mrb_string_value_cstr(mrb_state *mrb, mrb_value *ptr)
 {
-  struct RString *ps = mrb_str_ptr(*ptr);
+  mrb_value str = mrb_str_to_str(mrb, *ptr);
+  struct RString *ps = mrb_str_ptr(str);
   mrb_int len = mrb_str_strlen(mrb, ps);
   char *p = RSTR_PTR(ps);
 
@@ -2002,12 +2003,12 @@ mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck)
   const char *s;
   mrb_int len;
 
-  str = mrb_str_to_str(mrb, str);
   if (badcheck) {
+    /* Raises if the string contains a null character (the badcheck) */
     s = mrb_string_value_cstr(mrb, &str);
   }
   else {
-    s = RSTRING_PTR(str);
+    s = mrb_string_value_ptr(mrb, str);
   }
   if (s) {
     len = RSTRING_LEN(str);