Fix coverity-detected issues.

Author: michaelrsweet

cups/dnssd.c

@@ -3009,20 +3009,19 @@ avahi_resolve_cb(
 
   DEBUG_printf("3avahi_resolve_cb(resolver=%p, if_index=%d, protocol=%d, event=%s, name=\"%s\", type=\"%s\", domain=\"%s\", host=\"%s\", address=%p, port=%u, txtrec=%p, flags=%u, resolve=%p)", (void *)resolver, if_index, protocol, avahi_events[event], name, type, domain, host, (void *)address, (unsigned)port, (void *)txtrec, (unsigned)flags, (void *)resolve);
 
-  if (!resolver || event != AVAHI_RESOLVER_FOUND)
+  if (!resolver)
     return;
 
-  (void)resolver;
   (void)protocol;
   (void)flags;
 
   // Map the addresses "127.0.0.1" (IPv4) and "::1" (IPv6) to "localhost" to work around a well-known Avahi registration bug for local-only services (Issue #970)
-  if (address->proto == AVAHI_PROTO_INET && address->data.ipv4.address == htonl(0x7f000001))
+  if (address && address->proto == AVAHI_PROTO_INET && address->data.ipv4.address == htonl(0x7f000001))
   {
     DEBUG_puts("4avahi_resolve_cb: Mapping 127.0.0.1 to localhost.");
     host = "localhost";
   }
-  else if (address->proto == AVAHI_PROTO_INET6 && address->data.ipv6.address[0] == 0 && address->data.ipv6.address[1] == 0 && address->data.ipv6.address[2] == 0 && address->data.ipv6.address[3] == 0 && address->data.ipv6.address[4] == 0 && address->data.ipv6.address[5] == 0 && address->data.ipv6.address[6] == 0 && address->data.ipv6.address[7] == 0 && address->data.ipv6.address[8] == 0 && address->data.ipv6.address[9] == 0 && address->data.ipv6.address[10] == 0 && address->data.ipv6.address[11] == 0 && address->data.ipv6.address[12] == 0 && address->data.ipv6.address[13] == 0 && address->data.ipv6.address[14] == 0 && address->data.ipv6.address[15] == 1)
+  else if (address && address->proto == AVAHI_PROTO_INET6 && address->data.ipv6.address[0] == 0 && address->data.ipv6.address[1] == 0 && address->data.ipv6.address[2] == 0 && address->data.ipv6.address[3] == 0 && address->data.ipv6.address[4] == 0 && address->data.ipv6.address[5] == 0 && address->data.ipv6.address[6] == 0 && address->data.ipv6.address[7] == 0 && address->data.ipv6.address[8] == 0 && address->data.ipv6.address[9] == 0 && address->data.ipv6.address[10] == 0 && address->data.ipv6.address[11] == 0 && address->data.ipv6.address[12] == 0 && address->data.ipv6.address[13] == 0 && address->data.ipv6.address[14] == 0 && address->data.ipv6.address[15] == 1)
   {
     DEBUG_puts("4avahi_resolve_cb: Mapping ::1 to localhost.");
     host = "localhost";

cups/http.c

@@ -1886,6 +1886,7 @@ httpPeek(http_t *http,			// I - HTTP connection
     {
       DEBUG_puts("2httpPeek: Unable to copy decompressor stream.");
       http->error = ENOMEM;
+      inflateEnd(&stream);
       return (-1);
     }
 

cups/tls-gnutls.c

@@ -1742,8 +1742,12 @@ _httpTLSStart(http_t *http)		// I - Connection to server
 		*cnptr;			// Pointer into common name
     bool	have_creds = false;	// Have credentials?
 
+    cupsMutexLock(&tls_mutex);
+
     if (!tls_common_name)
     {
+      cupsMutexUnlock(&tls_mutex);
+
       if (http->fields[HTTP_FIELD_HOST])
       {
 	// Use hostname for TLS upgrade...
@@ -1777,9 +1781,9 @@ _httpTLSStart(http_t *http)		// I - Connection to server
 
       if (hostname[0])
         cn = hostname;
-    }
 
-    cupsMutexLock(&tls_mutex);
+      cupsMutexLock(&tls_mutex);
+    }
 
     if (!cn)
       cn = tls_common_name;

cups/tls-openssl.c

@@ -1715,8 +1715,12 @@ _httpTLSStart(http_t *http)		// I - Connection to server
     context = SSL_CTX_new(TLS_server_method());
 
     // Find the TLS certificate...
+    cupsMutexLock(&tls_mutex);
+
     if (!tls_common_name)
     {
+      cupsMutexUnlock(&tls_mutex);
+
       if (http->fields[HTTP_FIELD_HOST])
       {
 	// Use hostname for TLS upgrade...
@@ -1753,9 +1757,9 @@ _httpTLSStart(http_t *http)		// I - Connection to server
 
       if (hostname[0])
 	cn = hostname;
-    }
 
-    cupsMutexLock(&tls_mutex);
+      cupsMutexLock(&tls_mutex);
+    }
 
     if (!cn)
       cn = tls_common_name;

scheduler/ipp.c

@@ -138,10 +138,13 @@ cupsdProcessIPPRequest(
   ipp_attribute_t	*username;	/* requesting-user-name attr */
   int			sub_id;		/* Subscription ID */
   int			valid = 1;	/* Valid request? */
-  int			minor;		/* Minor version */
+  int			major,		/* IPP major version */
+			minor;		/* IPP minor version */
 
 
-  cupsdLogClient(con, CUPSD_LOG_DEBUG, "%s IPP/%d.%d request_id=%d", ippOpString(ippGetOperation(con->request)), ippGetVersion(con->request, &minor), minor, ippGetRequestId(con->request));
+  major = ippGetVersion(con->request, &minor);
+
+  cupsdLogClient(con, CUPSD_LOG_DEBUG, "%s IPP/%d.%d request_id=%d", ippOpString(ippGetOperation(con->request)), major, minor, ippGetRequestId(con->request));
 
   if (LogLevel >= CUPSD_LOG_DEBUG2)
   {

scheduler/job.c

@@ -4674,6 +4674,7 @@ load_request_root(void)
   */
 
   while ((dent = cupsDirRead(dir)) != NULL)
+  {
     if (strlen(dent->filename) >= 6 && dent->filename[0] == 'c')
     {
      /*
@@ -4730,6 +4731,7 @@ load_request_root(void)
         cupsdDeleteJob(job, CUPSD_JOB_FORCE);
       }
     }
+  }
 
   cupsDirClose(dir);
 }

tools/ippevepcl.c

@@ -1,7 +1,7 @@
 /*
  * Generic HP PCL printer command for ippeveprinter/CUPS.
  *
- * Copyright © 2020-2024 by OpenPrinting.
+ * Copyright © 2020-2025 by OpenPrinting.
  * Copyright © 2019 by Apple Inc.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -508,7 +508,11 @@ raster_to_pcl(const char *filename)	/* I - File to print (NULL for stdin) */
       break;
     }
 
-    line = malloc(header.cupsBytesPerLine);
+    if ((line = malloc(header.cupsBytesPerLine)) == NULL)
+    {
+      fprintf(stderr, "ERROR: Unable to allocate %u bytes for line, aborting.\n", header.cupsBytesPerLine);
+      break;
+    }
 
     pcl_start_page(&header, page);
     for (y = 0; y < header.cupsHeight; y ++)

tools/ippeveps.c

@@ -1091,7 +1091,11 @@ raster_to_ps(const char *filename)	/* I - Filename */
       break;
     }
 
-    line = malloc(header.cupsBytesPerLine);
+    if ((line = malloc(header.cupsBytesPerLine)) == NULL)
+    {
+      fprintf(stderr, "ERROR: Unable to allocate %u bytes for line, aborting.\n", header.cupsBytesPerLine);
+      break;
+    }
 
     dsc_page(page);