mailman/contribs7/mailman-2.1-CVE-2006-0052.patch

--- mailman-2.1.5.1.new/Mailman/Handlers/Scrubber.py    2006-03-02 14:58:34.000000000 +0100
+++ mailman-2.1.5.1/Mailman/Handlers/Scrubber.py        2006-05-09 12:56:06.000000000 +0200
@@ -256,8 +256,10 @@
         # If the message isn't a multipart, then we'll strip it out as an
         # attachment that would have to be separately downloaded.  Pipermail
         # will transform the url into a hyperlink.
-        elif not part.is_multipart():
+        elif part and not part.is_multipart():
             payload = part.get_payload(decode=True)
+           if payload is None:
+               continue
             ctype = part.get_type()
             size = len(payload)
             omask = os.umask(002)
1	--- mailman-2.1.5.1.new/Mailman/Handlers/Scrubber.py 2006-03-02 14:58:34.000000000 +0100
2	+++ mailman-2.1.5.1/Mailman/Handlers/Scrubber.py 2006-05-09 12:56:06.000000000 +0200
3	@@ -256,8 +256,10 @@
4	# If the message isn't a multipart, then we'll strip it out as an
5	# attachment that would have to be separately downloaded. Pipermail
6	# will transform the url into a hyperlink.
7	- elif not part.is_multipart():
8	+ elif part and not part.is_multipart():
9	payload = part.get_payload(decode=True)
10	+ if payload is None:
11	+ continue
12	ctype = part.get_type()
13	size = len(payload)
14	omask = os.umask(002)