From: William Lallemand <wlallemand@haproxy.org>
Date: Tue, 26 Jul 2022 08:35:24 +0000 (+0200)
Subject: DEBUG: fd: split the fd check
X-Git-Tag: v2.7-dev3~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc66f2f97d76613d732c49cc326791863b018f0e;p=thirdparty%2Fhaproxy.git

DEBUG: fd: split the fd check

Split the BUG_ON(fd < 0 || fd >= global.maxsock) so it's easier to know
if it quits because of a -1.
---

diff --git a/include/haproxy/fd.h b/include/haproxy/fd.h
index e8ef4f3bcd..8925efb66e 100644
--- a/include/haproxy/fd.h
+++ b/include/haproxy/fd.h
@@ -433,7 +433,8 @@ static inline void fd_insert(int fd, void *owner, void (*iocb)(int fd), int tgid
 	/* This must never happen and would definitely indicate a bug, in
 	 * addition to overwriting some unexpected memory areas.
 	 */
-	BUG_ON(fd < 0 || fd >= global.maxsock);
+	BUG_ON(fd < 0);
+	BUG_ON(fd >= global.maxsock);
 	BUG_ON(fdtab[fd].owner != NULL);
 	BUG_ON(fdtab[fd].state != 0);
 	BUG_ON(tgid < 1 || tgid > MAX_TGROUPS);