buffer: avoid undefined behaviour

Avoid 'delete this' as it can be hazardous and/or dependent on implementations. PR-URL: nodejs#5494 Reviewed-By: bnoordhuis - Ben Noordhuis <[email protected]> Reviewed-By: targos - Michaël Zasso <[email protected]>
ofrobots · Mar 3, 2016 · 67e2ff3 · 67e2ff3
1 parent 907386f
commit 67e2ff3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
@@ -139,18 +139,18 @@ CallbackInfo::~CallbackInfo() {
 
 void CallbackInfo::WeakCallback(
     const WeakCallbackInfo<CallbackInfo>& data) {
-  data.GetParameter()->WeakCallback(
+  CallbackInfo* self = data.GetParameter();
+  self->WeakCallback(
       data.GetIsolate(),
       static_cast<char*>(data.GetInternalField(kBufferInternalFieldIndex)));
+  delete self;
 }
 
 
 void CallbackInfo::WeakCallback(Isolate* isolate, char* const data) {
   callback_(data, hint_);
   int64_t change_in_bytes = -static_cast<int64_t>(sizeof(*this));
   isolate->AdjustAmountOfExternalAllocatedMemory(change_in_bytes);
-
-  delete this;
 }