Mirror fix from libcups.

diff --git a/cups/ipp.c b/cups/ipp.c
index 249033452aa9be6879f7a2599643513313061d2e..f484239561ed6d6ccbdc3f09c3d5f938f19c3b78 100644 (file)
--- 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 1e469a125b9d4bf1c786769edc9bb11a62ac1894..1ee76e8d2213a9a5dc1b36e8ed431137b8982db8 100644 (file)
--- 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...