technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Node.js: correct port data memory release.

Browse Source 
According to libuv documentation, uv_poll_t memory should be released
in a callback function passed to uv_close().  Otherwise, the Node.js application
process may crash at exit.
This commit is contained in:
Max Romanov
2020-08-07 15:06:24 +03:00
parent 78fd04adcf
commit 375cbc2cc4
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nodejs/unit-http/unit.cpp
View File

@@ -13,6 +13,8 @@
#include <nxt_unit_websocket.h> #include <nxt_unit_websocket.h>
static void delete_port_data(uv_handle_t* handle);
napi_ref Unit::constructor_; napi_ref Unit::constructor_;
@@ -418,7 +420,8 @@ Unit::remove_port(nxt_unit_ctx_t *ctx, nxt_unit_port_id_t *port_id)
if (node_ctx->port_id == *port_id) { if (node_ctx->port_id == *port_id) {
uv_poll_stop(&node_ctx->poll); uv_poll_stop(&node_ctx->poll);
delete node_ctx; node_ctx->poll.data = node_ctx;
uv_close((uv_handle_t *) &node_ctx->poll, delete_port_data);
ctx->data = NULL; ctx->data = NULL;
} }
@@ -428,6 +431,17 @@ Unit::remove_port(nxt_unit_ctx_t *ctx, nxt_unit_port_id_t *port_id)
} }
static void
delete_port_data(uv_handle_t* handle)
{
nxt_nodejs_ctx_t *node_ctx;
node_ctx = (nxt_nodejs_ctx_t *) handle->data;
delete node_ctx;
}
void void
Unit::quit_cb(nxt_unit_ctx_t *ctx) Unit::quit_cb(nxt_unit_ctx_t *ctx)
{ {