src: delete CallbackInfo when cleared from cleanup hook

addaleax · targos · commit 7aa2ee2bd8b8 · 2020-04-22T18:13:04.000+02:00
Fixes: #32400 PR-URL: #32405 Reviewed-By: Matheus Marchini <mat@mmarchini.me> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
@@ -162,14 +162,14 @@ void CallbackInfo::WeakCallback(
     const WeakCallbackInfo<CallbackInfo>& data) {
   CallbackInfo* self = data.GetParameter();
   self->WeakCallback(data.GetIsolate());
-  delete self;
 }
 
 
 void CallbackInfo::WeakCallback(Isolate* isolate) {
   callback_(data_, hint_);
   int64_t change_in_bytes = -static_cast<int64_t>(sizeof(*this));
   isolate->AdjustAmountOfExternalAllocatedMemory(change_in_bytes);
+  delete this;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -162,14 +162,14 @@ void CallbackInfo::WeakCallback(`
`162`	`162`	`const WeakCallbackInfo<CallbackInfo>& data) {`
`163`	`163`	`CallbackInfo* self = data.GetParameter();`
`164`	`164`	`self->WeakCallback(data.GetIsolate());`
`165`		`- delete self;`
`166`	`165`	`}`
`167`	`166`
`168`	`167`
`169`	`168`	`void CallbackInfo::WeakCallback(Isolate* isolate) {`
`170`	`169`	`callback_(data_, hint_);`
`171`	`170`	`int64_t change_in_bytes = -static_cast<int64_t>(sizeof(*this));`
`172`	`171`	`isolate->AdjustAmountOfExternalAllocatedMemory(change_in_bytes);`
	`172`	`+ delete this;`
`173`	`173`	`}`
`174`	`174`
`175`	`175`