diff options
| author |   Bryan Østergaard <kloeri@gentoo.org> | 2006-11-04 19:41:40 +0000 |
|---|---|---|
| committer | Bryan Østergaard <kloeri@gentoo.org> | 2006-11-04 19:41:40 +0000 |
| commit | 028de6e8db7e0b6d11b02aef5abbdf9f1a550496 (patch) | |
| tree | 193292d7db1e7554b17ad6a163fb2ac885613680 /media-gfx/graphicsmagick/files | |
| parent | www-client/amaya removal (pending 16th October 2006), see #129874 for reference. (diff) | |
| download | gentoo-2-028de6e8db7e0b6d11b02aef5abbdf9f1a550496.tar.gz gentoo-2-028de6e8db7e0b6d11b02aef5abbdf9f1a550496.tar.bz2 gentoo-2-028de6e8db7e0b6d11b02aef5abbdf9f1a550496.zip | |
Fix overflows, bug 152668.
(Portage version: 2.1.2_rc1-r3)
Diffstat (limited to 'media-gfx/graphicsmagick/files')
3 files changed, 53 insertions, 0 deletions
diff --git a/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7-r3 b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7-r3 new file mode 100644 index 000000000000..9a72057947c2 --- /dev/null +++ b/media-gfx/graphicsmagick/files/digest-graphicsmagick-1.1.7-r3 @@ -0,0 +1,3 @@ +MD5 f75d830ca623bf10385b3ad62c48437a GraphicsMagick-1.1.7.tar.bz2 4957394 +RMD160 9193ab3b109df6ce4b80cb2c1602c86ca36e3043 GraphicsMagick-1.1.7.tar.bz2 4957394 +SHA256 95f85e8bb84cc7ad05e84988f4cd93432ab2d4b300827fef34d1ada5e69196cc GraphicsMagick-1.1.7.tar.bz2 4957394 diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-dcm.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-dcm.patch new file mode 100644 index 000000000000..a9d33d0d0595 --- /dev/null +++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-dcm.patch @@ -0,0 +1,16 @@ +=================================================================== +RCS file: /GraphicsMagick/GraphicsMagick/coders/dcm.c,v +retrieving revision 1.133 +retrieving revision 1.134 +diff -u -p -r1.133 -r1.134 +--- GraphicsMagick/coders/dcm.c 2005/09/23 22:32:22 1.133 ++++ GraphicsMagick/coders/dcm.c 2006/11/02 14:23:28 1.134 +@@ -3022,7 +3022,7 @@ static Image *ReadDCMImage(const ImageIn + /* + Photometric interpretation. + */ +- for (i=0; i < (long) length; i++) ++ for (i=0; i < (long) Min(length, MaxTextExtent-1); i++) + photometric[i]=data[i]; + photometric[i]='\0'; + break; diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-palm.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-palm.patch new file mode 100644 index 000000000000..e2ec3a9383a7 --- /dev/null +++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.1.7-palm.patch @@ -0,0 +1,34 @@ +=================================================================== +RCS file: /GraphicsMagick/GraphicsMagick/coders/palm.c,v +retrieving revision 1.62 +retrieving revision 1.62.2.1 +diff -u -p -r1.62 -r1.62.2.1 +--- GraphicsMagick/coders/palm.c 2003/10/11 18:38:35 1.62 ++++ GraphicsMagick/coders/palm.c 2006/11/02 14:24:05 1.62.2.1 +@@ -541,7 +541,7 @@ static Image *ReadPALMImage(const ImageI + image->compression = RLECompression; + for (i = 0; i < (long) bytes_per_row; ) + { +- count = ReadBlobByte(image); ++ count = Min(ReadBlobByte(image), bytes_per_row-i); + byte = ReadBlobByte(image); + memset(one_row + i, (int) byte, count); + i += count; +@@ -579,6 +579,8 @@ static Image *ReadPALMImage(const ImageI + indexes=GetIndexes(image); + if(bits_per_pixel == 16) + { ++ if (image->columns > 2*bytes_per_row) ++ ThrowReaderException(CorruptImageError,CorruptImage,image); + for (x=0; x < (long) image->columns; x++) + { + color16 = (*ptr++ << 8); +@@ -595,6 +597,8 @@ static Image *ReadPALMImage(const ImageI + bit = 8 - bits_per_pixel; + for(x = 0; x < (long) image->columns; x++) + { ++ if (ptr - one_row >= bytes_per_row) ++ ThrowReaderException(CorruptImageError,CorruptImage,image); + index =(IndexPacket) (mask - (((*ptr) & (mask << bit)) >> bit)); + indexes[x] = index; + *q++ = image->colormap[index]; |