Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Allow rbx_meta_to_s to raise an exception

  • Loading branch information...
commit 3586083fe3e2d11ac31b726fc094aa0460b19354 1 parent 50ddb62
Evan Phoenix authored
Showing with 2 additions and 0 deletions.
  1. +1 −0  vm/llvm/jit_util.cpp
  2. +1 −0  vm/llvm/jit_visit.hpp
View
1  vm/llvm/jit_util.cpp
@@ -219,6 +219,7 @@ extern "C" {
Arguments args(obj, Qnil, 0, 0);
Object* ret = cache->execute(state, call_frame, args);
+ if(!ret) return 0;
if(!kind_of<String>(ret)) {
ret = obj->to_s(state, false);
View
1  vm/llvm/jit_visit.hpp
@@ -821,6 +821,7 @@ namespace rubinius {
Value* ret = sig.call("rbx_meta_to_s", args, 4, "", b());
stack_remove(1);
+ check_for_exception(ret);
stack_push(ret);
}
Please sign in to comment.
Something went wrong with that request. Please try again.