Fixes #54, thanks @zmoazeni!

Always return an integer when asking for stack sizes because "when we convert the nil to an int in C bad things happen"...
deivid-rodriguez · Apr 12, 2014 · 39f8763 · 39f8763 · zmoazeni · Apr 12, 2014
1 parent 35b2ca6
commit 39f8763
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@
  * Fix post_mortem mode
  * Command history is also saved after regular program termination, not only
 after quitting with the `q` command.
+ * Fix failure when calling Byebug.start with Timeout::timeout (see #54), thanks
+@zmoazeni!
 
 - Changes
  * History file is `per project` by default now

diff --git a/ext/byebug/context.c b/ext/byebug/context.c
@@ -40,7 +40,7 @@ context_mark(void *data)
 static int
 real_stack_size()
 {
-  return FIX2INT(rb_funcall(cContext, rb_intern("real_stack_size"), 0));
+  return FIX2INT(rb_funcall(cContext, rb_intern("stack_size"), 1, Qtrue));
 }
 
 extern VALUE

diff --git a/lib/byebug/context.rb b/lib/byebug/context.rb
@@ -3,24 +3,20 @@ module Byebug
   class Context
 
     class << self
-      def stack_size
+      def stack_size(byebug_frames = false)
         if backtrace = Thread.current.backtrace_locations(0)
-          backtrace.drop_while { |l| !ignored(l.path) }
-                   .drop_while { |l|  ignored(l.path) }
-                   .take_while { |l| !ignored(l.path) }
-                   .size
+          unless byebug_frames
+            backtrace = backtrace.drop_while { |l| !ignored(l.path) }
+                                 .drop_while { |l|  ignored(l.path) }
+                                 .take_while { |l| !ignored(l.path) }
+          end
+          backtrace.size
         else
-          print 'No backtrace available!!'
+          print 'WARNING: No backtrace available!!'
           0
         end
       end
 
-      def real_stack_size
-        if backtrace = Thread.current.backtrace_locations(0)
-          backtrace.size
-        end
-      end
-
       def ignored(path)
         IGNORED_FILES.include?(path)
       end