0001-zlib-Don-t-allow-parallel-writes.patch

From 89ecea925bbe7253bf832aed2b8eb46694e2d12a Mon Sep 17 00:00:00 2001
From: isaacs <i@izs.me>
Date: Tue, 10 Jan 2012 12:07:30 -0800
Subject: [PATCH 1/2] zlib: Don't allow parallel writes

---
 src/node_zlib.cc |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/node_zlib.cc b/src/node_zlib.cc
index b3b430f..6a0fd38 100644
--- a/src/node_zlib.cc
+++ b/src/node_zlib.cc
@@ -83,6 +83,9 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
     ZCtx<mode> *ctx = ObjectWrap::Unwrap< ZCtx<mode> >(args.This());
     assert(ctx->init_done_ && "write before init");
 
+    assert(!ctx->write_in_progress_ && "write already in progress");
+    ctx->write_in_progress_ = true;
+
     unsigned int flush = args[0]->Uint32Value();
     Bytef *in;
     Bytef *out;
@@ -184,6 +187,8 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
     Local<Integer> avail_out = Integer::New(ctx->strm_.avail_out);
     Local<Integer> avail_in = Integer::New(ctx->strm_.avail_in);
 
+    ctx->write_in_progress_ = false;
+
     // call the write() cb
     assert(req_wrap->object_->Get(callback_sym)->IsFunction() &&
            "Invalid callback");
@@ -284,6 +289,7 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
         assert(0 && "wtf?");
     }
 
+    ctx->write_in_progress_ = false;
     ctx->init_done_ = true;
     assert(err == Z_OK);
   }
@@ -301,6 +307,8 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
   int flush_;
 
   int chunk_size_;
+
+  bool write_in_progress_;
 };
 
 
-- 
1.7.5.4

0002-zlib-Embed-req_wrap-instead-of-using-new-delete.patch

From 084bbcc1923afa8895c595216d87021e94b93332 Mon Sep 17 00:00:00 2001
From: isaacs <i@izs.me>
Date: Tue, 10 Jan 2012 12:18:18 -0800
Subject: [PATCH 2/2] zlib: Embed req_wrap instead of using new/delete

---
 src/node_zlib.cc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/node_zlib.cc b/src/node_zlib.cc
index 6a0fd38..ba4a668 100644
--- a/src/node_zlib.cc
+++ b/src/node_zlib.cc
@@ -115,7 +115,7 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
     assert(out_off + out_len <= Buffer::Length(out_buf));
     out = reinterpret_cast<Bytef *>(Buffer::Data(out_buf) + out_off);
 
-    WorkReqWrap *req_wrap = new WorkReqWrap();
+    WorkReqWrap *req_wrap = &(ctx->req_wrap_);
 
     req_wrap->data_ = ctx;
     ctx->strm_.avail_in = in_len;
@@ -195,8 +195,6 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
     Local<Value> args[2] = { avail_in, avail_out };
     MakeCallback(req_wrap->object_, "callback", 2, args);
 
-    // delete the ReqWrap
-    delete req_wrap;
     ctx->Unref();
   }
 
@@ -309,6 +307,8 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
   int chunk_size_;
 
   bool write_in_progress_;
+
+  WorkReqWrap req_wrap_;
 };
 
 
-- 
1.7.5.4