Darcsweb-Url:
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.5;a=darcs_commitdiff;h=20061109164334-dd049-39f5a0ec041e4db41257ae74d8ba51b666b526da.gz;
[imagemagick-6.2.9_3-2siwenna1-i686
voroskoi <[EMAIL PROTECTED]>**20061109164334
secfix relbump
] {
addfile ./source/xapps/imagemagick/imagemagick-overflows.diff
hunk ./source/xapps/imagemagick/FrugalBuild 1
-# Last modified: Mon, 04 Sep 2006 15:06:58 +0200
hunk ./source/xapps/imagemagick/FrugalBuild 6
-pkgrel=1
+pkgrel=2siwenna1
hunk ./source/xapps/imagemagick/FrugalBuild 14
-source=(ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-`echo $pkgver |
tr '_' '-'`.tar.bz2 \
- libpng_mmx_patch_x86_64.patch)
-sha1sums=('2f0f00fff0b0c3691b37ba9d38f17979a8328295' \
- 'e42f3acbe85b6098af75c5cecc9a254baaa0482c')
-
+source=(ftp://ftp.frugalware.org/pub/frugalware/frugalware-stable/source/xapps/imagemagick/ImageMagick-`echo
$pkgver | tr '_' '-'`.tar.bz2 \
+ libpng_mmx_patch_x86_64.patch imagemagick-overflows.diff)
hunk ./source/xapps/imagemagick/FrugalBuild 24
+ Fpatch imagemagick-overflows.diff
hunk ./source/xapps/imagemagick/FrugalBuild 31
+sha1sums=('2f0f00fff0b0c3691b37ba9d38f17979a8328295' \
+ 'e42f3acbe85b6098af75c5cecc9a254baaa0482c' \
+ '18732414669d68f692c0a102a87046747b28b7ec')
hunk ./source/xapps/imagemagick/imagemagick-overflows.diff 1
+--- ImageMagick-6.2.9/coders/dcm.c 2006-01-21 18:54:06.000000000 +0100
++++ ImageMagick-6.2.9/coders/dcm.c.new 2006-11-09 15:42:56.000000000 +0100
+@@ -2950,7 +2950,7 @@
+ /*
+ Photometric interpretation.
+ */
+- for (i=0; i < (long) length; i++)
++ for (i=0; i < (long) Min(length, MaxTextExtent-1); i++)
+ photometric[i]=(char) data[i];
+ photometric[i]='\0';
+ break;
+--- ImageMagick-6.2.9/coders/palm.c 2006-01-08 06:41:08.000000000 +0100
++++ ImageMagick-6.2.9/coders/palm.c.new 2006-11-09 16:41:05.000000000
+0100
+@@ -398,7 +398,7 @@
+ 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);
+ (void) ResetMagickMemory(one_row+i,(int) byte,count);
+ i+=count;
+@@ -431,6 +431,8 @@
+ indexes=GetIndexes(image);
+ if (bits_per_pixel == 16)
+ {
++ if (image->columns > 2*bytes_per_row)
++ ThrowReaderException(CorruptImageError, "Corrupt
image");
+ for (x=0; x < (long) image->columns; x++)
+ {
+ color16=(*ptr++ << 8);
+@@ -447,6 +449,8 @@
+ bit=8-bits_per_pixel;
+ for (x=0; x < (long) image->columns; x++)
+ {
++ if (ptr - one_row >= bytes_per_row)
++ ThrowReaderException(CorruptImageError, "Corrupt
image");
+ index=(IndexPacket) (mask-(((*ptr) & (mask << bit)) >> bit));
+ indexes[x]=index;
+ *q++=image->colormap[index];
}
_______________________________________________
Frugalware-darcs mailing list
Frugalware-darcs@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-darcs
