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

Leak Wrappable's template

Browse source 
Since it is declared as static variable it will be released
automatically when process exits, which causes crashes in
renderer process because the template will then be released
later than V8 is closed.

This commit simply leaks the template so the crash won't happen,
this leak should be fine since leaking resource on exit is not
a bad thing.
This commit is contained in:
Cheng Zhao 2016-05-10 16:07:04 +09:00
parent 0df2d882ea
commit ea07d4c6c8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
native_mate/wrappable.h
View file

@ -77,15 +77,15 @@ class Wrappable : public WrappableBase {
// Init the class with T::BuildPrototype.
void Init(v8::Isolate* isolate) {
// Fill the object template.
if (templ_.IsEmpty()) {
if (!templ_) {
v8::Local<v8::ObjectTemplate> templ = v8::ObjectTemplate::New(isolate);
T::BuildPrototype(isolate, templ);
templ_.Reset(isolate, templ);
templ_ = new v8::Global<v8::ObjectTemplate>(isolate, templ);
}
v8::Local<v8::Object> wrapper;
v8::Local<v8::ObjectTemplate> templ = v8::Local<v8::ObjectTemplate>::New(
isolate, templ_);
isolate, *templ_);
// |wrapper| may be empty in some extreme cases, e.g., when
// Object.prototype.constructor is overwritten.
if (!templ->NewInstance(isolate->GetCurrentContext()).ToLocal(&wrapper)) {
@ -98,14 +98,14 @@ class Wrappable : public WrappableBase {
}
private:
static v8::Global<v8::ObjectTemplate> templ_;
static v8::Global<v8::ObjectTemplate>* templ_; // Leaked on purpose
DISALLOW_COPY_AND_ASSIGN(Wrappable);
};
// static
template<typename T>
v8::Global<v8::ObjectTemplate> Wrappable<T>::templ_;
v8::Global<v8::ObjectTemplate>* Wrappable<T>::templ_ = nullptr;
// This converter handles any subclass of Wrappable.
template <typename T>