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

Completing chained shared memory buffers.

Browse Source 
After 41331471eee7 completion handlers should complete next buffer in chain.
Otherwise buffer memory may leak.

Thanks to Peter Tkatchenko for reporing the issue and testing fixes.
This commit is contained in:
Max Romanov
2020-04-14 16:11:13 +03:00
parent 3c58a4bfc1
commit 9a422b8984
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nxt_port_memory.c
View File

@@ -111,7 +111,7 @@ nxt_port_mmap_buf_completion(nxt_task_t *task, void *obj, void *data)
{
u_char *p;
nxt_mp_t *mp;
nxt_buf_t *b;
nxt_buf_t *b, *next;
nxt_port_t *port;
nxt_process_t *process;
nxt_chunk_id_t c;
@@ -124,11 +124,12 @@ nxt_port_mmap_buf_completion(nxt_task_t *task, void *obj, void *data)
b = obj;
mp = b->data;
nxt_assert(data == b->parent);
mmap_handler = data;
complete_buf:
hdr = mmap_handler->hdr;
if (nxt_slow_path(hdr->src_pid != nxt_pid && hdr->dst_pid != nxt_pid)) {
@@ -184,8 +185,18 @@ release_buf:
nxt_port_mmap_handler_use(mmap_handler, -1);
next = b->next;
mp = b->data;
nxt_mp_free(mp, b);
nxt_mp_release(mp);
if (next != NULL) {
b = next;
mmap_handler = b->parent;
goto complete_buf;
}
}