src: use std::unique_ptr in base-object-inl.h

Drive-by fix: delete superflouos nullptr in ptr.reset(). PR-URL: #17079 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Timothy Gu <[email protected]>
nodejs · Nov 19, 2017 · f841fc6 · f841fc6
1 parent ce6c7f5
commit f841fc6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/base_object-inl.h b/src/base_object-inl.h
@@ -65,9 +65,8 @@ inline Environment* BaseObject::env() const {
 template <typename Type>
 inline void BaseObject::WeakCallback(
     const v8::WeakCallbackInfo<Type>& data) {
-  Type* self = data.GetParameter();
+  std::unique_ptr<Type> self(data.GetParameter());
   self->persistent().Reset();
-  delete self;
 }
 
 

diff --git a/src/env-inl.h b/src/env-inl.h
@@ -329,7 +329,7 @@ inline Environment::~Environment() {
 #if HAVE_INSPECTOR
   // Destroy inspector agent before erasing the context. The inspector
   // destructor depends on the context still being accessible.
-  inspector_agent_.reset(nullptr);
+  inspector_agent_.reset();
 #endif
 
   context()->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex,