Fix make-and-model whitespace trimming (Issue #1096)

diff --git a/CHANGES.md b/CHANGES.md
index d7e1f26e9ecb3c336e997d5446baf17fe2ca3d73..7415d454027f2a5a1cb7d744063829966363ae47 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Changes in CUPS v2.4.12 (YYYY-MM-DD)
 ------------------------------------
 
 - Fixed a compressed file error handling bug (Issue #1070)
+- Fixed a bug in the make-and-model whitespace trimming code (Issue #1096)
 - 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 a6163a0e1f472f97f6695c17a8bcb1d337107349..a3198a79514930a9d29c3e195fced9eaf06ba15b 100644 (file)
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -3293,6 +3293,8 @@ _ppdCreateFromIPP2(
       mptr --;
       if (*mptr == ' ')
        *mptr = '\0';
+      else
+        break;
     }
 
     if (!make[0])