luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux: handle when libuv allocates a file descriptor normally used by stdio (#4558)

Browse Source 
File descriptors 0 to 2 are used by stdio by default, but are not guaranteed
to be in use by stdio, in which case one or more of them may get used by libuv.

For example, STDERR can be closed by passing 2>&- on the program command line
in the shell. In which case, the file descriptor 2 would be used by libuv

libuv should handle this case without aborting
This commit is contained in:
Thomas Abraham 2024-10-01 11:49:34 -04:00
parent f806be87d3
commit c90228198b
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/unix/core.c
View File

@ -641,7 +641,8 @@ int uv__close_nocheckstdio(int fd) {
int uv__close(int fd) {
assert(fd > STDERR_FILENO); /* Catch stdio close bugs. */
if (!uv__low_fd_flag)
assert(fd > STDERR_FILENO); /* Catch stdio close bugs. */
#if defined(__MVS__)
SAVE_ERRNO(epoll_file_close(fd));
#endif

2
src/unix/internal.h
View File

@ -243,6 +243,8 @@ struct uv__statx {
#define uv__nonblock uv__nonblock_fcntl
#endif
extern int uv__low_fd_flag;
/* core */
int uv__cloexec(int fd, int set);
int uv__nonblock_ioctl(int fd, int set);

5
src/unix/linux.c
View File

@ -266,6 +266,8 @@ struct watcher_root {
struct watcher_list* rbh_root;
};
int uv__low_fd_flag = 0;
static int uv__inotify_fork(uv_loop_t* loop, struct watcher_list* root);
static void uv__inotify_read(uv_loop_t* loop,
uv__io_t* w,
@ -649,6 +651,9 @@ int uv__platform_loop_init(uv_loop_t* loop) {
if (loop->backend_fd == -1)
return UV__ERR(errno);
if (loop->backend_fd <= STDERR_FILENO)
uv__low_fd_flag = 1;
uv__iou_init(loop->backend_fd, &lfields->ctl, 256, 0);
return 0;