From 1701f572e2f29b27958bfdb63ea74718ad741532 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 27 Dec 2013 14:47:50 +0800
Subject: [PATCH] Fix crash when calling method of destroyed object.

---
 browser/api/atom_api_event_emitter.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/browser/api/atom_api_event_emitter.cc b/browser/api/atom_api_event_emitter.cc
index c550cfc94023..15dc5ddedaf9 100644
--- a/browser/api/atom_api_event_emitter.cc
+++ b/browser/api/atom_api_event_emitter.cc
@@ -21,6 +21,10 @@ EventEmitter::EventEmitter(v8::Handle<v8::Object> wrapper) {
 }
 
 EventEmitter::~EventEmitter() {
+  // Clear the aligned pointer, it should have been done by ObjectWrap but
+  // somehow node v0.11.x changed this behaviour.
+  v8::HandleScope handle_scope(node_isolate);
+  handle()->SetAlignedPointerInInternalField(0, NULL);
 }
 
 bool EventEmitter::Emit(const std::string& name) {