Drop non-keyword characters from PPD names (Issue #1118)

michaelrsweet · michaelrsweet · commit c0b8e4812504 · 2025-04-02T15:14:58.000-04:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@ Changes in CUPS v2.4.12 (YYYY-MM-DD)
 - Fixed a bug in the make-and-model whitespace trimming code (Issue #1096)
 - Fixed a removal of IPP Everywhere permanent queue if installation failed (Issue #1102)
 - Fixed `ServerToken None` in scheduler (Issue #1111)
+- Fixed invalid IPP keyword values created from PPD option names (Issue #1118)
 - Fixed client raster printing from macOS (Issue #1143)
 - Fixed the default User-Agent string.
 - Fixed a recursion issue in `ippReadIO`.
diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
@@ -1,7 +1,7 @@
 /*
  * PPD cache implementation for CUPS.
  *
- * Copyright © 2022-2024 by OpenPrinting.
+ * Copyright © 2022-2025 by OpenPrinting.
  * Copyright © 2010-2021 by Apple Inc.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -5680,11 +5680,6 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 	nodash = 1;
       }
     }
-    else
-    {
-      *ptr++ = *ppd;
-      nodash = 0;
-    }
 
     if (nodash == 0)
     {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* PPD cache implementation for CUPS.`
`3`	`3`	`*`
`4`		`- * Copyright © 2022-2024 by OpenPrinting.`
	`4`	`+ * Copyright © 2022-2025 by OpenPrinting.`
`5`	`5`	`* Copyright © 2010-2021 by Apple Inc.`
`6`	`6`	`*`
`7`	`7`	`* Licensed under Apache License v2.0. See the file "LICENSE" for more`
`@@ -5680,11 +5680,6 @@ pwg_unppdize_name(const char ppd, / I - PPD keyword */`
`5680`	`5680`	`nodash = 1;`
`5681`	`5681`	`}`
`5682`	`5682`	`}`
`5683`		`- else`
`5684`		`- {`
`5685`		`- ptr++ = ppd;`
`5686`		`- nodash = 0;`
`5687`		`- }`
`5688`	`5683`
`5689`	`5684`	`if (nodash == 0)`
`5690`	`5685`	`{`