summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2013-11-12 11:23:19 -0800
committerTimothy J Fontaine <tjfontaine@gmail.com>2013-11-12 11:23:19 -0800
commit16934d9210546bf19d4af8d98652aa5d636ce693 (patch)
tree1905f35f84db3ab6dc82bc6bff5dac2b835817aa
parentac799ba0afa9731e281bf23886d1a3f5adec1784 (diff)
downloadnode-16934d9210546bf19d4af8d98652aa5d636ce693.tar.gz
src: add HandleScope in HandleWrap::OnClose
Fixes a 4 byte leak on handles closing. AKA The Walmart leak. MakeCallback doesn't have a HandleScope. That means the callers scope will retain ownership of created handles from MakeCallback and related. There is by default a wrapping HandleScope before uv_run, if the caller doesn't have a HandleScope on the stack the global will take ownership which won't be reaped until the uv loop exits. If a uv callback is fired, and there is no enclosing HandleScope in the cb, you will appear to leak 4-bytes for every invocation. Take heed. cc @hueniverse
-rw-r--r--src/handle_wrap.cc2
-rw-r--r--src/node.h11
2 files changed, 13 insertions, 0 deletions
diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc
index a63421bc2..c70b78641 100644
--- a/src/handle_wrap.cc
+++ b/src/handle_wrap.cc
@@ -134,6 +134,8 @@ HandleWrap::~HandleWrap() {
void HandleWrap::OnClose(uv_handle_t* handle) {
+ HandleScope scope;
+
HandleWrap* wrap = static_cast<HandleWrap*>(handle->data);
// The wrap object should still be there.
diff --git a/src/node.h b/src/node.h
index 574a93ac7..b2c8fc4c2 100644
--- a/src/node.h
+++ b/src/node.h
@@ -238,6 +238,17 @@ node_module_struct* get_builtin_module(const char *name);
*/
NODE_EXTERN void AtExit(void (*cb)(void* arg), void* arg = 0);
+/*
+ * MakeCallback doesn't have a HandleScope. That means the callers scope
+ * will retain ownership of created handles from MakeCallback and related.
+ * There is by default a wrapping HandleScope before uv_run, if the caller
+ * doesn't have a HandleScope on the stack the global will take ownership
+ * which won't be reaped until the uv loop exits.
+ *
+ * If a uv callback is fired, and there is no enclosing HandleScope in the
+ * cb, you will appear to leak 4-bytes for every invocation. Take heed.
+ */
+
NODE_EXTERN void SetErrno(uv_err_t err);
NODE_EXTERN v8::Handle<v8::Value>
MakeCallback(const v8::Handle<v8::Object> object,