CVS update of imagemagick (coders/dcm.c debian/changelog)

[Daniel Kobras]

    Date: Saturday, April 28, 2007 @ 13:53:52
  Author: kobras
    Path: /cvsroot/pkg-gmagick/imagemagick

Modified: coders/dcm.c debian/changelog

Fix integer overflow in DCM coder (CVE-2007-1797). Lifted from upstream
CVS.


------------------+
 coders/dcm.c     |   10 ++++++++--
 debian/changelog |   12 +++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)


Index: imagemagick/coders/dcm.c
diff -u imagemagick/coders/dcm.c:1.1 imagemagick/coders/dcm.c:1.2
--- imagemagick/coders/dcm.c:1.1	Tue Feb 27 01:07:04 2007
+++ imagemagick/coders/dcm.c	Sat Apr 28 13:53:52 2007
@@ -2756,7 +2756,11 @@
   count=ReadBlob(image,128,(unsigned char *) magick);
   count=ReadBlob(image,4,(unsigned char *) magick);
   if ((count != 4) || (LocaleNCompare(magick,"DICM",4) != 0))
-    (void) SeekBlob(image,0L,SEEK_SET);
+    {
+      offset=SeekBlob(image,0L,SEEK_SET);
+      if (offset < 0)
+        ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+    }
   /*
     Read DCM Medical image.
   */
@@ -2809,7 +2813,9 @@
       (void) CopyMagickString(implicit_vr,explicit_vr,MaxTextExtent);
     if ((use_explicit == MagickFalse) || (strcmp(implicit_vr,"!!") == 0))
       {
-        (void) SeekBlob(image,(MagickOffsetType) -2,SEEK_CUR);
+        offset=SeekBlob(image,(MagickOffsetType) -2,SEEK_CUR);
+	if (offset < 0)
+	  ThrowReaderException(CorruptImageError,"ImproperImageHeader");
         quantum=4;
       }
     else
Index: imagemagick/debian/changelog
diff -u imagemagick/debian/changelog:1.9 imagemagick/debian/changelog:1.10
--- imagemagick/debian/changelog:1.9	Sat Apr 28 13:09:24 2007
+++ imagemagick/debian/changelog	Sat Apr 28 13:53:52 2007
@@ -14,8 +14,18 @@
     - Typo in description of --resize command fixed. Closes: #364826
   * Magick++/lib/Image.cpp: Include cstdlib header to fix build failure
     with gcc 4.3. Patch thanks to Martin Michlmayr. Closes: #417237
+  * coders/dcm.c: Fix integer overflow in DCM coder. (CVE-2007-1797)
+    Closes: #418057
+  * coders/icon.c: Fix segfault in ICON coder.
+  * coders/pcx.c: Fix heap overflow in PCX coder.
+  * coders/pict.c: Fix multiple segfaults in PICT coder.
+  * coders/png.c: Fix segfault in PNG coder.
+  * coders/pnm.c: Fix segfault in PNM coder.
+  * coders/sgi.c: Fix segfault in SGI coder.
+  * coders/sun.c: Fix segfault during conversion in SUN coder.
+  * coders/xwd.c: Fix segfault during conversion in XWD coder. (CVE-2007-1667)
 
- -- Daniel Kobras <kobras at debian.org>  Sat, 28 Apr 2007 15:07:12 +0200
+ -- Daniel Kobras <kobras at debian.org>  Sat, 28 Apr 2007 15:51:48 +0200
 
 imagemagick (7:6.2.4.5.dfsg1-0.14) unstable; urgency=high