From d5aff7182d6caca9c69514df5fa90bfc203cb5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Fri, 18 May 2018 17:44:59 +0200 Subject: [node] prevent race condition for renderFinished --- platform/node/src/node_map.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp index 9b76f0f542..521cca1a51 100644 --- a/platform/node/src/node_map.cpp +++ b/platform/node/src/node_map.cpp @@ -447,6 +447,12 @@ void NodeMap::startRender(NodeMap::RenderOptions options) { } void NodeMap::renderFinished() { + if (!callback) { + // In some situations, the render finishes at the same time as we call cancel. Make sure + // we are only finishing a render once. + return; + } + Nan::HandleScope scope; // We're done with this render call, so we're unrefing so that the loop could close. -- cgit v1.2.1