components/imagemagick/patches/CVE-2007-4987.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 20 Mar 2012 13:18:56 -0700
changeset 740 80e91c717db8
parent 501 3cac4bd957e8
permissions -rw-r--r--
7153204 developer/gcc-45 has dependency on developer/gnu-binutils, strs tsuite fails build on s11u1_11
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
501
3cac4bd957e8 6955594 Problem with utility/imagemagick
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     1
--- ImageMagick-6.3.4/magick/blob.c.orig	Thu Aug 25 00:30:13 2011
3cac4bd957e8 6955594 Problem with utility/imagemagick
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     2
+++ ImageMagick-6.3.4/magick/blob.c	Thu Aug 25 00:30:48 2011
3cac4bd957e8 6955594 Problem with utility/imagemagick
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     3
@@ -3089,7 +3089,7 @@
3cac4bd957e8 6955594 Problem with utility/imagemagick
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     4
 
3cac4bd957e8 6955594 Problem with utility/imagemagick
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     5
   assert(image != (Image *) NULL);
3cac4bd957e8 6955594 Problem with utility/imagemagick
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     6
   assert(image->signature == MagickSignature);
3cac4bd957e8 6955594 Problem with utility/imagemagick
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     7
-  for (i=0; i < (long) MaxTextExtent; i++)
3cac4bd957e8 6955594 Problem with utility/imagemagick
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     8
+  for (i=0; i < (long) MaxTextExtent - 1; i++)
3cac4bd957e8 6955594 Problem with utility/imagemagick
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     9
   {
3cac4bd957e8 6955594 Problem with utility/imagemagick
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    10
     p=ReadBlobStream(image,1,buffer,&count);
3cac4bd957e8 6955594 Problem with utility/imagemagick
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    11
     if (count != 1)