commit cde0746b3c53b58347c9130d9fdf73a38cef9b81
author Nikias Bassen <nikias@gmx.li> Mon Oct 14 12:15:55 2024 +0200
committer Nikias Bassen <nikias@gmx.li> Mon Oct 14 12:15:55 2024 +0200
tree d7fe2a849cebf7c0e3bb17703444bbe8f7cc89f4
parent a7f0543fb1ecb20ac7121c0fd77297200e0e43fc

tools: Fix potential issue with select() in case the network fd is higher than the usbmux fd

Thanks to @sleepinging for pointing this out.

tools/iproxy.c

diff --git a/tools/iproxy.c b/tools/iproxy.c
index 1bb9e77..6849ef9 100644
--- a/tools/iproxy.c
+++ b/tools/iproxy.c
@@ -169,10 +169,11 @@
 		FD_ZERO(&fds);
 		FD_SET(cdata->fd, &fds);
 		FD_SET(cdata->sfd, &fds);
+		int maxfd = cdata->fd > cdata->sfd ? cdata->fd : cdata->sfd;
 
 		while (1) {
 			fd_set read_fds = fds;
-			int ret_sel = select(cdata->sfd+1, &read_fds, NULL, NULL, NULL);
+			int ret_sel = select(maxfd+1, &read_fds, NULL, NULL, NULL);
 			if (ret_sel < 0) {
 				perror("select");
 				break;