suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rktio: fix fd leak in filesystem-change-evt with kqueue

Browse Source 
Affects Mac OS and BSDs.
This commit is contained in:
Matthew Flatt 2019-04-29 06:57:36 -06:00
parent cbfaf428d2
commit 5c7d7aae68
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
racket/src/rktio/rktio_fs_change.c
View File

@ -3,6 +3,7 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h>
#if defined(HAVE_KQUEUE_SYSCALL) #if defined(HAVE_KQUEUE_SYSCALL)
# include <fcntl.h> # include <fcntl.h>
#endif #endif
@ -169,17 +170,19 @@ static void fs_change_release(rktio_t *rktio, rktio_fs_change_t *fc)
# elif defined(HAVE_INOTIFY_SYSCALL) # elif defined(HAVE_INOTIFY_SYSCALL)
do_inotify_remove(rktio, fc->fd); do_inotify_remove(rktio, fc->fd);
# elif defined(HAVE_KQUEUE_SYSCALL) # elif defined(HAVE_KQUEUE_SYSCALL)
if (rktio_ltps_handle_get_data(rktio, fc->lth)) { {
/* Not zeroed, so never signaled. Change the auto behavior
to free the handle, and deregsiter the file descriptor. */
rktio_fd_t *rfd; rktio_fd_t *rfd;
rktio_ltps_handle_set_auto(rktio, fc->lth, RKTIO_LTPS_HANDLE_FREE);
rfd = rktio_system_fd(rktio, fc->fd, 0); rfd = rktio_system_fd(rktio, fc->fd, 0);
(void)rktio_ltps_add(rktio, fc->lt, rfd, RKTIO_LTPS_REMOVE_VNODE); if (rktio_ltps_handle_get_data(rktio, fc->lth)) {
/* Not zeroed, so never signaled. Change the auto behavior
to free the handle, and deregsiter the file descriptor. */
rktio_ltps_handle_set_auto(rktio, fc->lth, RKTIO_LTPS_HANDLE_FREE);
(void)rktio_ltps_add(rktio, fc->lt, rfd, RKTIO_LTPS_REMOVE_VNODE);
} else {
/* Was signaled, so we need to free it. */
free(fc->lth);
}
rktio_close(rktio, rfd); rktio_close(rktio, rfd);
} else {
/* Was signaled, so we need to free it. */
free(fc->lth);
} }
#endif #endif