src: turn inspector raw pointer into unique_ptr

Use a unique pointer to make ownership clear. PR-URL: #16974 Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Eugene Ostroukhov <[email protected]>
nodejs · Dec 13, 2017 · b1802ed · b1802ed
1 parent ad331f2
commit b1802ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -347,8 +347,9 @@ inline Environment::~Environment() {
   v8::HandleScope handle_scope(isolate());
 
 #if HAVE_INSPECTOR
-  // Destroy inspector agent before erasing the context.
-  delete inspector_agent_;
+  // Destroy inspector agent before erasing the context. The inspector
+  // destructor depends on the context still being accessible.
+  inspector_agent_.reset(nullptr);
 #endif
 
   context()->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex,

diff --git a/src/env.h b/src/env.h
@@ -673,7 +673,7 @@ class Environment {
 
 #if HAVE_INSPECTOR
   inline inspector::Agent* inspector_agent() const {
-    return inspector_agent_;
+    return inspector_agent_.get();
   }
 #endif
 
@@ -718,7 +718,7 @@ class Environment {
   std::map<std::string, uint64_t> performance_marks_;
 
 #if HAVE_INSPECTOR
-  inspector::Agent* const inspector_agent_;
+  std::unique_ptr<inspector::Agent> inspector_agent_;
 #endif
 
   HandleWrapQueue handle_wrap_queue_;