summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Loer <chris.loer@gmail.com>2018-02-23 16:24:29 -0800
committerChris Loer <chris.loer@gmail.com>2018-02-23 16:42:33 -0800
commit0aeec9f93d867f6a54d0243c3dc5a8e6bd1f6947 (patch)
tree49ea02075920d5022e1c085268d4efdcd2d8b57d
parentdfeb5b25d3b78b238253ff2866aaab207fd5daa4 (diff)
downloadqtlocation-mapboxgl-upstream/node-request-gc.tar.gz
[core, node] Hold on to map handle during NodeMap::request.upstream/node-request-gc
Avoids a potential crash if garbage collection happens in the middle of a call to NodeMap::request from a map that's eligible for GC. Fixes issue #11281
-rw-r--r--platform/node/src/node_map.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp
index ac14df0228..0fe69e8ac9 100644
--- a/platform/node/src/node_map.cpp
+++ b/platform/node/src/node_map.cpp
@@ -1154,6 +1154,10 @@ NodeMap::~NodeMap() {
std::unique_ptr<mbgl::AsyncRequest> NodeMap::request(const mbgl::Resource& resource, mbgl::FileSource::Callback callback_) {
Nan::HandleScope scope;
+ // Because this method may be called while this NodeMap is already eligible for garbage collection,
+ // we need to explicitly hold onto our own handle here so that GC during a v8 call doesn't destroy
+ // *this while we're still executing code.
+ handle();
v8::Local<v8::Value> argv[] = {
Nan::New<v8::External>(this),