From 208f92068d1169316d6c93eeb3843274548b6a20 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <msweet@msweet.org>
Date: Sat, 22 Feb 2025 11:05:18 -0500
Subject: [PATCH] Don't need to guard against free(NULL), pickup code tweak in
 PDFio.

---
 cups/encode.c         |  8 +++-----
 cups/file.c           |  6 ++----
 pdfio                 |  2 +-
 tools/ippeveprinter.c | 27 +++++++++------------------
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/cups/encode.c b/cups/encode.c
index 2e3a54cc0..1e8130cf9 100644
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,7 +1,7 @@
 //
 // Option encoding routines for CUPS.
 //
-// Copyright © 2021-2024 by OpenPrinting.
+// Copyright © 2021-2025 by OpenPrinting.
 // Copyright © 2007-2019 by Apple Inc.
 // Copyright © 1997-2007 by Easy Software Products.
 //
@@ -503,8 +503,7 @@ _cupsEncodeOption(
 	  {
 	    cupsFreeOptions(num_cols, cols);
 
-	    if (copy)
-	      free(copy);
+	    free(copy);
 
 	    ippDeleteAttribute(ipp, attr);
 	    return (NULL);
@@ -521,8 +520,7 @@ _cupsEncodeOption(
     }
   }
 
-  if (copy)
-    free(copy);
+  free(copy);
 
   return (attr);
 }
diff --git a/cups/file.c b/cups/file.c
index e6eeaad1d..813e04f25 100644
--- a/cups/file.c
+++ b/cups/file.c
@@ -6,7 +6,7 @@
 // our own file functions allows us to provide transparent support of
 // different line endings, gzip'd print files, etc.
 //
-// Copyright © 2021-2024 by OpenPrinting.
+// Copyright © 2021-2025 by OpenPrinting.
 // Copyright © 2007-2019 by Apple Inc.
 // Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 //
@@ -141,9 +141,7 @@ cupsFileClose(cups_file_t *fp)		// I - CUPS file
   fd   = fp->fd;
   mode = fp->mode;
 
-  if (fp->printf_buffer)
-    free(fp->printf_buffer);
-
+  free(fp->printf_buffer);
   free(fp);
 
   // Close the file, returning the close status...
diff --git a/pdfio b/pdfio
index d535067c9..6e2e4bbcc 160000
--- a/pdfio
+++ b/pdfio
@@ -1 +1 @@
-Subproject commit d535067c910557fe2b27bcf4835ee7d70617195b
+Subproject commit 6e2e4bbcc6d790a3b87a36c03338b97ea0cf8499
diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c
index ec91f9b4c..3d52f7641 100644
--- a/tools/ippeveprinter.c
+++ b/tools/ippeveprinter.c
@@ -1986,8 +1986,7 @@ delete_job(ippeve_job_t *job)		// I - Job
 
   ippDelete(job->attrs);
 
-  if (job->message)
-    free(job->message);
+  free(job->message);
 
   if (job->filename)
   {
@@ -2018,22 +2017,14 @@ delete_printer(
 
   cupsDNSSDDelete(printer->dnssd);
 
-  if (printer->dnssd_name)
-    free(printer->dnssd_name);
-  if (printer->name)
-    free(printer->name);
-  if (printer->icons[0])
-    free(printer->icons[0]);
-  if (printer->strings)
-    free(printer->strings);
-  if (printer->command)
-    free(printer->command);
-  if (printer->device_uri)
-    free(printer->device_uri);
-  if (printer->directory)
-    free(printer->directory);
-  if (printer->hostname)
-    free(printer->hostname);
+  free(printer->dnssd_name);
+  free(printer->name);
+  free(printer->icons[0]);
+  free(printer->strings);
+  free(printer->command);
+  free(printer->device_uri);
+  free(printer->directory);
+  free(printer->hostname);
 
   ippDelete(printer->attrs);
   cupsArrayDelete(printer->jobs);