From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Fri, 11 Nov 2022 15:31:06 +0000 (-0500)
Subject: Fix backchannel status checking bugs
X-Git-Tag: v2.4.3~57^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F528%2Fhead;p=thirdparty%2Fcups.git

Fix backchannel status checking bugs

Checking for merely (status < 0) is a bug because the check for timeout is deliberate.

Note that you have an if (timeout < 0) at the beginning

So if the timeout is set to a value, it should check for that value.

Co-Authored-By: aaaaaa123456789 <aaaaaa123456789@acidch.at>
---

diff --git a/cups/backchannel.c b/cups/backchannel.c
index 916c314337..77ad60eab1 100644
--- a/cups/backchannel.c
+++ b/cups/backchannel.c
@@ -65,7 +65,7 @@ cupsBackChannelRead(char   *buffer,	/* I - Buffer to read into */
   }
   while (status < 0 && errno != EINTR && errno != EAGAIN);
 
-  if (status < 0)
+  if (status <= 0)
     return (-1);			/* Timeout! */
 
  /*
@@ -173,8 +173,8 @@ cups_setup(fd_set         *set,		/* I - Set for select() */
            struct timeval *tval,	/* I - Timer value */
 	   double         timeout)	/* I - Timeout in seconds */
 {
-  tval->tv_sec = (int)timeout;
-  tval->tv_usec = (int)(1000000.0 * (timeout - tval->tv_sec));
+  tval->tv_sec = (time_t)timeout;
+  tval->tv_usec = (suseconds_t)(1000000.0 * (timeout - tval->tv_sec));
 
   FD_ZERO(set);
   FD_SET(3, set);