From 32aedcf43ded4e119c30bf642ec3dd96e27c2fa7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Thu, 26 May 2005 12:53:40 +0000
Subject: [PATCH] fix a denial of service

---
 ImageMagick-5.5.6-mask.patch | 27 +++++++++++++++++++++++++++
 ImageMagick.spec             |  8 +++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 ImageMagick-5.5.6-mask.patch

diff --git a/ImageMagick-5.5.6-mask.patch b/ImageMagick-5.5.6-mask.patch
new file mode 100644
index 0000000..633c7cf
--- /dev/null
+++ b/ImageMagick-5.5.6-mask.patch
@@ -0,0 +1,27 @@
+--- ImageMagick-5.5.6/coders/xwd.c.mask	2003-01-04 22:55:30.000000000 -0500
++++ ImageMagick-5.5.6/coders/xwd.c	2005-05-26 08:22:43.627646000 -0400
+@@ -343,21 +343,21 @@
+         */
+         red_mask=ximage->red_mask;
+         red_shift=0;
+-        while ((red_mask & 0x01) == 0)
++        while ((red_mask != 0) && ((red_mask & 0x01) == 0))
+         {
+           red_mask>>=1;
+           red_shift++;
+         }
+         green_mask=ximage->green_mask;
+         green_shift=0;
+-        while ((green_mask & 0x01) == 0)
++        while ((green_mask != 0) && ((green_mask & 0x01) == 0))
+         {
+           green_mask>>=1;
+           green_shift++;
+         }
+         blue_mask=ximage->blue_mask;
+         blue_shift=0;
+-        while ((blue_mask & 0x01) == 0)
++        while ((blue_mask != 0) && ((blue_mask & 0x01) == 0))
+         {
+           blue_mask>>=1;
+           blue_shift++;
diff --git a/ImageMagick.spec b/ImageMagick.spec
index d2c36cb..35fb5d9 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -9,7 +9,7 @@ Version: %{VER}.%{Patchlevel}
 %else
 Version: %{VER}
 %endif
-Release: 1
+Release: 2
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -23,6 +23,8 @@ Patch3: ImageMagick-6.2.0-compress.patch
 Patch4: ImageMagick-6.2.1-local_doc.patch
 Patch6: ImageMagick-6.2.1-pkgconfig.patch
 Patch7: ImageMagick-6.2.1-fixed.patch
+# 158791
+Patch8: ImageMagick-5.5.6-mask.patch
 
 Url: http://www.imagemagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -116,6 +118,7 @@ however.
 %patch4 -p1 -b .local_doc
 %patch6 -p1 -b .pkgconfig
 %patch7 -p1 -b .fixed
+%patch8 -p1 -b .mask
 
 %build
 %configure --enable-shared \
@@ -225,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Thu May 26 2005  <mclasen@redhat.com> - 6.2.2.0-2
+- fix a denial of service in the xwd coder (#158791, CAN-2005-1739)
+
 * Tue Apr 26 2005 Matthias Clasen <mclasen@redhat.com> - 6.2.2.0-1
 - Update to 6.2.2 to fix a heap corruption issue
   in the pnm coder.