The scheduler did not support long MIME media types (STR #4270)

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

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 884c533972ef919727e1a70e9d9d09635371dc11..0b6d942b3da275f1d79bc9e7efe3bf4fb2ec39d1 100644 (file)
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -12,6 +12,7 @@ CHANGES IN CUPS V1.6.2
        - Added a French localization (STR #4247)
        - Added a Russian localization (STR #4228)
        - Updated the Catalan localization (STR #4202)
+       - The scheduler did not support long MIME media types (STR #4270)
        - The cupsfilter command did not set the CHARSET environment variable
          for the text filters (STR #4273)
        - The lp command did not show errors for unknown "--foo" (STR #4261)

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 9064883a51b53a15f69a4f5e28a7e90911410ac1..ecb88f6487de32721a162c29dcdaf4434206537b 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -8074,7 +8074,7 @@ print_job(cupsd_client_t  *con,           /* I - Client connection */
     * Grab format from client...
     */
 
-    if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super,
+    if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]", super,
                type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST,
@@ -8091,7 +8091,7 @@ print_job(cupsd_client_t  *con,           /* I - Client connection */
     * Use default document format...
     */
 
-    if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2)
+    if (sscanf(default_format, "%15[^/]/%255[^;]", super, type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST,
                       _("Bad document-format \"%s\"."),
@@ -9306,7 +9306,7 @@ send_document(cupsd_client_t  *con,       /* I - Client connection */
     * Grab format from client...
     */
 
-    if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]",
+    if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]",
                super, type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"."),
@@ -9322,7 +9322,7 @@ send_document(cupsd_client_t  *con,       /* I - Client connection */
     * Use default document format...
     */
 
-    if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2)
+    if (sscanf(default_format, "%15[^/]/%255[^;]", super, type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST,
                       _("Bad document-format-default \"%s\"."), default_format);
@@ -10822,7 +10822,7 @@ validate_job(cupsd_client_t  *con,      /* I - Client connection */
   if ((format = ippFindAttribute(con->request, "document-format",
                                  IPP_TAG_MIMETYPE)) != NULL)
   {
-    if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]",
+    if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]",
                super, type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST,

diff --git a/scheduler/testmime.c b/scheduler/testmime.c
index a754e748dbdbf386f1444c8a908d628bf9ea7ac9..e2534ca6a502b7052970ed764195d773c136aae8 100644 (file)
--- a/scheduler/testmime.c
+++ b/scheduler/testmime.c
@@ -3,7 +3,7 @@
  *
  *   MIME test program for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -132,7 +132,7 @@ main(int  argc,                             /* I - Number of command-line args */
     }
     else
     {
-      sscanf(argv[i], "%15[^/]/%31s", super, type);
+      sscanf(argv[i], "%15[^/]/%255s", super, type);
       dst = mimeType(mime, super, type);
 
       filters = mimeFilter2(mime, src, srcinfo.st_size, dst, &cost);