ppd-cache.c: fix memory leak in _cupsConvertOptions()

zdohnal · zdohnal · commit 2777330a80ca · 2025-09-03T08:22:31.000+02:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -24,6 +24,8 @@ Changes in CUPS v2.4.13 (YYYY-MM-DD)
 - Fixed support for the server name in the ErrorLog filename (Issue #1277)
 - Fixed job cleanup after daemon restart (Issue #1315)
 - Fixed handling of buggy DYMO USB printer serial numbers (Issue #1338)
+- Fixed unreachable block in IPP backend (Issue #1351)
+- Fixed memory leak in _cupsConvertOptions (Issue #1354)
 
 
 Changes in CUPS v2.4.12 (2025-04-08)
diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
@@ -229,6 +229,7 @@ _cupsConvertOptions(
                     "y-dimension", size->length);
 
       ippAddCollection(media_col, IPP_TAG_ZERO, "media-size", media_size);
+      ippDelete(media_size);
     }
 
     for (i = 0; i < media_col_sup->num_values; i ++)
@@ -248,6 +249,7 @@ _cupsConvertOptions(
     }
 
     ippAddCollection(request, IPP_TAG_JOB, "media-col", media_col);
+    ippDelete(media_col);
   }
 
   if ((keyword = cupsGetOption("output-bin", num_options, options)) == NULL)

Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,7 @@ _cupsConvertOptions(`
`229`	`229`	`"y-dimension", size->length);`
`230`	`230`
`231`	`231`	`ippAddCollection(media_col, IPP_TAG_ZERO, "media-size", media_size);`
	`232`	`+ ippDelete(media_size);`
`232`	`233`	`}`
`233`	`234`
`234`	`235`	`for (i = 0; i < media_col_sup->num_values; i ++)`
`@@ -248,6 +249,7 @@ _cupsConvertOptions(`
`248`	`249`	`}`
`249`	`250`
`250`	`251`	`ippAddCollection(request, IPP_TAG_JOB, "media-col", media_col);`
	`252`	`+ ippDelete(media_col);`
`251`	`253`	`}`
`252`	`254`
`253`	`255`	`if ((keyword = cupsGetOption("output-bin", num_options, options)) == NULL)`