components/cups/patches/str3914.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 478 143405c872eb
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
478
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
     1
See: http://www.cups.org/str.php?L3914 for details.
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
     2
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
     3
Index: filter/image-gif.c
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
     4
===================================================================
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
     5
--- filter/image-gif.c	(revision 9862)
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
     6
+++ filter/image-gif.c	(working copy)
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
     7
@@ -648,11 +648,13 @@
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
     8
 
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
     9
     if (code == max_code)
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    10
     {
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    11
-      *sp++ = firstcode;
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    12
-      code  = oldcode;
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    13
+      if (sp < (stack + 8192))
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    14
+	*sp++ = firstcode;
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    15
+
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    16
+      code = oldcode;
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    17
     }
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    18
 
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    19
-    while (code >= clear_code)
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    20
+    while (code >= clear_code && sp < (stack + 8192))
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    21
     {
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    22
       *sp++ = table[1][code];
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    23
       if (code == table[0][code])
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    24
@@ -661,9 +663,11 @@
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    25
       code = table[0][code];
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    26
     }
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    27
 
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    28
-    *sp++ = firstcode = table[1][code];
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    29
-    code  = max_code;
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    30
+    if (sp < (stack + 8192))
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    31
+      *sp++ = firstcode = table[1][code];
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    32
 
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    33
+    code = max_code;
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    34
+
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    35
     if (code < 4096)
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    36
     {
143405c872eb 7079992 Problem with print/cups
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset
    37
       table[0][code] = oldcode;