From 5b46f6c602c24c9cdf995914fc6998981f1e53ec Mon Sep 17 00:00:00 2001
From: sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 10 Sep 2013 05:37:39 +0000
Subject: * vm_backtrace.c (vm_backtrace_to_ary): Ignore the second argument if
   it is nil. [Bug #8884] [ruby-core:57094]

* test/ruby/test_backtrace.rb (test_caller_with_nil_length):
  Test for above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm_backtrace.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'vm_backtrace.c')

diff --git a/vm_backtrace.c b/vm_backtrace.c
index 3287c1f950..3945993e42 100644
--- a/vm_backtrace.c
+++ b/vm_backtrace.c
@@ -787,6 +787,8 @@ vm_backtrace_to_ary(rb_thread_t *th, int argc, VALUE *argv, int lev_default, int
 
     rb_scan_args(argc, argv, "02", &level, &vn);
 
+    if (argc == 2 && NIL_P(vn)) argc--;
+
     switch (argc) {
       case 0:
 	lev = lev_default + lev_plus;
-- 
cgit v1.2.3