cupsBackendReport() did not handle newlines in 1284 Device IDs (STR #4005)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10206 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.5.txt b/CHANGES-1.5.txt
index 49d4d5a087da0ceb8860c966e904cd707167b8e3..58a0851c4fbbb56f067445a3099f9c46f287d731 100644 (file)
--- a/CHANGES-1.5.txt
+++ b/CHANGES-1.5.txt
@@ -4,8 +4,10 @@ CHANGES-1.5.txt
 CHANGES IN CUPS V1.5.1
 
        - Documentation updates (STR #3885, STR #3886, STR #3946, STR #3969)
-       - Localization updates (STR #3997)
+       - Localization updates (STR #3840, STR #3997)
        - Build fixes (STR #3956)
+       - cupsBackendReport() did not handle newlines in 1284 Device IDs
+         (STR #4005)
        - USB backend fixes for libusb (STR #3965, STR #3978)
        - The DBUS notifier did not validate string parameters (STR #3984)
        - Group quota ACLs did not work with Kerberos (STR #3972)

diff --git a/cups/backend.c b/cups/backend.c
index d09794f8bdc81066ce64ac71bfdb972dbf54e95b..031a3919c4b74f8bdf224455dcfd48e7c55159f3 100644 (file)
--- a/cups/backend.c
+++ b/cups/backend.c
@@ -3,7 +3,7 @@
  *
  *   Backend functions for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -125,7 +125,10 @@ quote_string(const char *s)                /* I - String to write */
       if (*s == '\\' || *s == '\"')
        putchar('\\');
 
-      putchar(*s);
+      if (*s == '\n')
+        putchar(' ');
+      else
+        putchar(*s);
 
       s ++;
     }