@@ -138,7 +138,13 @@ namespace rubinius { Object* NativeMethodEnvironment::get_object(VALUE val) { if(CAPI_REFERENCE_P(val)) { - return capi::Handle::from(val)->object(); + capi::Handle* handle = capi::Handle::from(val); + if(!handle->valid_p()) { + std::cerr << "Invalid handle usage detected!\n"; + rubinius::abort(); + } + + return handle->object(); /* if(CAPI_GLOBAL_HANDLE_P(handle)) { Handles& global_handles = state_->shared.global_handles(); vm/builtin/nativemethod.cpp @@ -36,6 +36,7 @@ namespace rubinius { } Handle::~Handle() { + invalidate(); } } } vm/capi/handle.cpp @@ -31,6 +31,7 @@ namespace rubinius { Object* object_; HandleType type_; int references_; + unsigned int checksum_; union { RArray* rarray; @@ -45,12 +46,21 @@ namespace rubinius { , object_(obj) , type_(cUnknown) , references_(0) + , checksum_(0xffff) { as_.rarray = 0; } ~Handle(); + bool valid_p() { + return checksum_ == 0xffff; + } + + void invalidate() { + checksum_ = 0; + } + Object* object() { return object_; } vm/capi/handle.hpp 73824ab4c6cf1fd35e691ca26e6edd1bd8e33d5c Evan Phoenix ephoenix@engineyard.com http://github.com/evanphx/rubinius/commit/a09b9b197e662a96f175c851afae3b8ae8130b27 a09b9b197e662a96f175c851afae3b8ae8130b27 2009-06-22T11:42:12-07:00 2009-06-22T11:42:12-07:00 Add trivial checksuming to capi::Handle to aid in debugging 2b2399a77878c45b0944cf196ceaca533ec256df Evan Phoenix ephoenix@engineyard.com