summaryrefslogtreecommitdiff
path: root/deps/uvwasi
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2020-05-23 09:41:20 -0400
committercjihrig <cjihrig@gmail.com>2020-05-25 09:45:35 -0400
commit2d2d210db7ebf554c310dc1196c44ba30976d0f0 (patch)
tree1226bba96c5298c3006fb465a265e538adfa5802 /deps/uvwasi
parentc072124814ca45e2f51afe0d5e202b0df6db9b4b (diff)
downloadnode-new-2d2d210db7ebf554c310dc1196c44ba30976d0f0.tar.gz
deps: uvwasi: cherry-pick 9e75217
Original commit message: poll_oneoff: add missing uv_run() in cleanup This allows ASAN to pass. PR-URL: https://github.com/nodejs/node/pull/33521 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Diffstat (limited to 'deps/uvwasi')
-rw-r--r--deps/uvwasi/src/poll_oneoff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/deps/uvwasi/src/poll_oneoff.c b/deps/uvwasi/src/poll_oneoff.c
index 97b8ef332d..a4b1c3c842 100644
--- a/deps/uvwasi/src/poll_oneoff.c
+++ b/deps/uvwasi/src/poll_oneoff.c
@@ -114,6 +114,8 @@ uvwasi_errno_t uvwasi__poll_oneoff_state_cleanup(
for (i = 0; i < state->handle_cnt; i++)
uv_close((uv_handle_t*) &state->poll_handles[i], NULL);
+ uv_run(&state->loop, UV_RUN_NOWAIT);
+
state->max_fds = 0;
state->fdevent_cnt = 0;
state->handle_cnt = 0;