binding_of_caller 0.3.1 → 0.4.0

data/README.md

@@ -21,31 +21,37 @@ call stack, not limited to just the immediate caller.
 Example: Modifying a local inside the caller of a caller
 --------
 
-    def a
-      var = 10
-      b
-      puts var
-    end
+```ruby
+def a
+  var = 10
+  b
+  puts var
+end
 
-    def b
-      c
-    end
+def b
+  c
+end
 
-    def c
-      binding.of_caller(2).eval('var = :hello')
-    end
+def c
+  binding.of_caller(2).eval('var = :hello')
+end
 
-    a()
+a()
 
-    # OUTPUT
-    # => hello
+# OUTPUT
+# => hello
+```
+
+Spinoff project
+-------
+
+This project is a spinoff from the [Pry REPL project.](http://pry.github.com)
 
 Features and limitations
 -------------------------
 
 * Only works with MRI 1.9.2
-* Broken in 1.9.3, support will hopefully be provided in the near
-* future.
+* Broken in 1.9.3, support will hopefully be provided in the near future.
 * Does not work in 1.8.7, but there is a well known (continuation-based) hack to get a `Binding#of_caller` there.
 
 Contact

data/ext/binding_of_caller/binding_of_caller.c

@@ -58,24 +58,25 @@ binding_alloc(VALUE klass)
   return obj;
 }
 
-static bool valid_frame_p(rb_control_frame_t * cfp) {
+static bool valid_frame_p(rb_control_frame_t * cfp, rb_control_frame_t * limit_cfp) {
+  if (cfp > limit_cfp)
+    rb_raise(rb_eRuntimeError, "Invalid frame, gone beyond end of stack!");
+
   return cfp->iseq && !NIL_P(cfp->self);
 }
 
-static rb_control_frame_t * find_valid_frame(rb_control_frame_t * cfp) {
+static rb_control_frame_t * find_valid_frame(rb_control_frame_t * cfp, rb_control_frame_t * limit_cfp) {
   int error_count = 0;
 
   while (error_count <= max_frame_errors) {
     cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
 
-    if (valid_frame_p(cfp))
+    if (valid_frame_p(cfp, limit_cfp))
       return cfp;
     else
       error_count += 1;
   }
 
-  rb_raise(rb_eRuntimeError, "No valid stack frame found.");
-
   // never reached
   return 0;
 }
@@ -84,15 +85,17 @@ static VALUE binding_of_caller(VALUE self, VALUE rb_level)
 {
   rb_thread_t *th = GET_THREAD();
   rb_control_frame_t *cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
+  rb_control_frame_t *limit_cfp = (void *)(th->stack + th->stack_size);
   int level = FIX2INT(rb_level);
 
   // attempt to locate the nth parent control frame
-  for (int i = 0; i < level; i++)
+  for (int i = 0; i < level; i++) {
     cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
 
-  // if did not find a valid one, then search for a valid one
-  if (!valid_frame_p(cfp))
-    cfp = find_valid_frame(cfp);
+    // skip invalid frames
+    if (!valid_frame_p(cfp, limit_cfp))
+      cfp = find_valid_frame(cfp, limit_cfp);
+  }
 
   VALUE bindval = binding_alloc(rb_cBinding);
   rb_binding_t *bind;

data/lib/binding_of_caller/version.rb

@@ -1,3 +1,3 @@
 module BindingOfCaller
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: binding_of_caller
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 Z
+date: 2011-10-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bacon