From: Michael R Sweet <msweet@msweet.org>
Date: Wed, 31 Jan 2024 15:27:00 +0000 (-0500)
Subject: Mirror fix from libcups.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a01c48cbda370e9d80a175fa56fb64f81799fd9b;p=thirdparty%2Fcups.git

Mirror fix from libcups.
---

diff --git a/cups/ipp.c b/cups/ipp.c
index 249033452a..f484239561 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -333,7 +333,7 @@ ippAddCredentialsString(
         if (*cptr == '\n')
           cptr ++;			// Skip LF
       }
-      else if ((cptr = strchr(cptr, '\n')) != NULL)
+      else if ((cptr = strchr(cstart, '\n')) != NULL)
       {
         // Terminate on LF
         *cptr++ = '\0';
diff --git a/cups/string.c b/cups/string.c
index 1e469a125b..1ee76e8d22 100644
--- a/cups/string.c
+++ b/cups/string.c
@@ -197,7 +197,7 @@ cupsFormatStringv(
 
 
   // Range check input...
-  if (!buffer || bufsize < 2 || !format || !ap)
+  if (!buffer || bufsize < 2 || !format)
     return (-1);
 
   // Loop through the format string, formatting as needed...