Check for negative max-fds limit and set to 65535. Fixes a test hang.

zdohnal · Sep 20, 2024 · 0c5ff99 · 0c5ff99
1 parent ca3c40b
commit 0c5ff99
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/scheduler/client.c b/scheduler/client.c
@@ -68,7 +68,7 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */
   * Make sure we don't have a full set of clients already...
   */
 
-  if (cupsArrayGetCount(Clients) == MaxClients)
+  if (MaxClients && cupsArrayGetCount(Clients) >= MaxClients)
     return;
 
   cupsdSetBusyState(1);

diff --git a/scheduler/main.c b/scheduler/main.c
@@ -507,10 +507,16 @@ main(int  argc,				/* I - Number of command-line args */
   * to the number of TCP port number values (64k-1)...
   */
 
-  getrlimit(RLIMIT_NOFILE, &limit);
-
-  if ((MaxFDs = limit.rlim_max) > 65535)
+  if (getrlimit(RLIMIT_NOFILE, &limit))
+  {
+    // This should never happen but if it does choose a safe upper limit...
+    perror("getrlimit");
+    MaxFDs = 256;
+  }
+  else if ((MaxFDs = limit.rlim_max) > 65535 || MaxFDs <= 0)
+  {
     MaxFDs = 65535;
+  }
 
   limit.rlim_cur = (rlim_t)MaxFDs;