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

diff --git a/CHANGES.md b/CHANGES.md
index 2db76b3e9179cd33eb9988da74153095f3e1a695..22c0b98f432a49411d277785a7fde3d96d01d20b 100644 (file)
--- 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
index 5d61f7c9f5a6021a6813a05cb818a81ebdf7d8f8..a4c2b4c5b816cb9ea344b4a2c967328f528408a1 100644 (file)
--- 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)
     {