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

fhinkel · fhinkel · commit f841fc63ddc4 · 2017-11-19T09:20:26.000+01:00
Drive-by fix: delete superflouos nullptr in ptr.reset(). PR-URL: #17079 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com>
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,

Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,8 @@ inline Environment* BaseObject::env() const {`
`65`	`65`	`template <typename Type>`
`66`	`66`	`inline void BaseObject::WeakCallback(`
`67`	`67`	`const v8::WeakCallbackInfo<Type>& data) {`
`68`		`- Type* self = data.GetParameter();`
	`68`	`+ std::unique_ptr<Type> self(data.GetParameter());`
`69`	`69`	`self->persistent().Reset();`
`70`		`- delete self;`
`71`	`70`	`}`
`72`	`71`
`73`	`72`