diff options
author | Ali Ijaz Sheikh <ofrobots@google.com> | 2017-10-24 22:24:28 -0700 |
---|---|---|
committer | Ali Ijaz Sheikh <ofrobots@google.com> | 2017-10-25 16:51:27 -0700 |
commit | e3503aca086f3f2f9587004ac594ed83a57f7443 (patch) | |
tree | cdfcb5e647e052147d5384b9e2bdaff885aa4c32 /src/env.h | |
parent | e8de2bfd138c42f4632777c01d3ef79a03fb8333 (diff) | |
download | android-node-v8-e3503aca086f3f2f9587004ac594ed83a57f7443.tar.gz android-node-v8-e3503aca086f3f2f9587004ac594ed83a57f7443.tar.bz2 android-node-v8-e3503aca086f3f2f9587004ac594ed83a57f7443.zip |
src: destroy inspector agent before context
The inspector_agent depends on the context still being accessible
during the destructor execution.
PR-URL: https://github.com/nodejs/node/pull/16472
Fixes: https://github.com/nodejs/node/issues/15558
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'src/env.h')
-rw-r--r-- | src/env.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -667,8 +667,8 @@ class Environment { #undef V #if HAVE_INSPECTOR - inline inspector::Agent* inspector_agent() { - return &inspector_agent_; + inline inspector::Agent* inspector_agent() const { + return inspector_agent_; } #endif @@ -713,7 +713,7 @@ class Environment { std::map<std::string, uint64_t> performance_marks_; #if HAVE_INSPECTOR - inspector::Agent inspector_agent_; + inspector::Agent* const inspector_agent_; #endif HandleWrapQueue handle_wrap_queue_; |