mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Guard against double erasing an object, fixes #44.

Browse source
This commit is contained in:
Cheng Zhao 2013-07-29 19:14:35 +08:00
parent 402dc2f5d2
commit e995383401
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/api/atom_api_id_weak_map.cc
View file

@ -5,6 +5,8 @@
#include "common/api/atom_api_id_weak_map.h" #include "common/api/atom_api_id_weak_map.h"
#include "base/logging.h"
namespace atom { namespace atom {
namespace api { namespace api {
@ -26,6 +28,11 @@ bool IDWeakMap::Has(int key) const {
} }
void IDWeakMap::Erase(v8::Isolate* isolate, int key) { void IDWeakMap::Erase(v8::Isolate* isolate, int key) {
if (!Has(key)) {
LOG(WARNING) << "Object with key " << key << " is being GCed for twice.";
return;
}
v8::Persistent<v8::Value> value = map_[key]; v8::Persistent<v8::Value> value = map_[key];
value.ClearWeak(isolate); value.ClearWeak(isolate);
value.Dispose(isolate); value.Dispose(isolate);
@ -47,6 +54,7 @@ void IDWeakMap::WeakCallback(v8::Isolate* isolate,
IDWeakMap* obj = static_cast<IDWeakMap*>(data); IDWeakMap* obj = static_cast<IDWeakMap*>(data);
int key = value->ToObject()->GetHiddenValue( int key = value->ToObject()->GetHiddenValue(
v8::String::New("IDWeakMapKey"))->IntegerValue(); v8::String::New("IDWeakMapKey"))->IntegerValue();
obj->Erase(isolate, key); obj->Erase(isolate, key);
} }