Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/gd2/patches/004-gd2-2.0.35-CVE-2009-3546.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 130 5e67396e42dc
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
130
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
# Patch for libgd2 Version 2.0.35 CVE-2009-3546
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
--- gd_gd.c	2006-04-05 08:52:22.000000000 -0700
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
+++ gd_gd.c	2011-02-16 17:57:09.865711091 -0800
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
@@ -44,6 +44,10 @@
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
 	    {
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
 	      goto fail1;
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
 	    }
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
+	  if (im->colorsTotal > gdMaxColors)
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
+	    {
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
+		goto fail1;
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
+	    }
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
 	}
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
       /* Int to accommodate truecolor single-color transparency */
5e67396e42dc 7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
       if (!gdGetInt (&im->transparent, in))
upstream/oracle/userland-gate