Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/node_zlib.cc
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ class ZCtx : public AsyncWrap, public ThreadPoolWork {
ctx->write_result_[0] = ctx->strm_.avail_out;
ctx->write_result_[1] = ctx->strm_.avail_in;
ctx->write_in_progress_ = false;
ctx->Unref();
}
ctx->Unref();
return;
}

Expand Down Expand Up @@ -363,6 +363,7 @@ class ZCtx : public AsyncWrap, public ThreadPoolWork {
// v8 land!
void AfterThreadPoolWork(int status) override {
AllocScope alloc_scope(this);
OnScopeLeave on_scope_leave([&]() { Unref(); });

write_in_progress_ = false;

Expand All @@ -387,7 +388,6 @@ class ZCtx : public AsyncWrap, public ThreadPoolWork {
write_js_callback_);
MakeCallback(cb, 0, nullptr);

Unref();
if (pending_close_)
Close();
}
Expand All @@ -409,8 +409,6 @@ class ZCtx : public AsyncWrap, public ThreadPoolWork {
MakeCallback(env()->onerror_string(), arraysize(args), args);

// no hope of rescue.
if (write_in_progress_)
Unref();
write_in_progress_ = false;
if (pending_close_)
Close();
Expand Down
28 changes: 28 additions & 0 deletions test/parallel/test-zlib-invalid-input-memory.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Flags: --expose-gc
'use strict';
const common = require('../common');
const onGC = require('../common/ongc');
const assert = require('assert');
const zlib = require('zlib');

// Checks that, if a zlib context fails with an error, it can still be GC'ed:
// Refs: https://github.com/nodejs/node/issues/22705

const ongc = common.mustCall();

{
const input = Buffer.from('foobar');
const strm = zlib.createInflate();
strm.end(input);
strm.once('error', common.mustCall((err) => {
assert(err);
setImmediate(() => {
global.gc();
// Keep the event loop alive for seeing the async_hooks destroy hook
// we use for GC tracking...
// TODO(addaleax): This should maybe not be necessary?
setImmediate(() => {});
});
}));
onGC(strm, { ongc });
}