From bf7b73081b17eda9589e5cd6ee0242912633d306 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Sun, 6 Mar 2016 22:27:49 -0800 Subject: Fixed CommandRunner shunting a message with a null byte in the body. --- Mailman/Queue/CommandRunner.py | 3 ++- NEWS | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Mailman/Queue/CommandRunner.py b/Mailman/Queue/CommandRunner.py index c5cc3d94..a9f6f000 100644 --- a/Mailman/Queue/CommandRunner.py +++ b/Mailman/Queue/CommandRunner.py @@ -134,7 +134,8 @@ class Results: handler = sys.modules[modname] # ValueError can be raised if cmd has dots in it. # and KeyError if cmd is otherwise good but ends with a dot. - except (ImportError, ValueError, KeyError): + # and TypeError if cmd has a null byte. + except (ImportError, ValueError, KeyError, TypeError): # If we're on line zero, it was the Subject: header that didn't # contain a command. It's possible there's a Re: prefix (or # localized version thereof) on the Subject: line that's messing diff --git a/NEWS b/NEWS index b4549610..bb41216d 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,9 @@ Here is a history of user visible changes to Mailman. Bug fixes and other patches + - Fixed an issue with CommandRunner shunting a malformed message with a + null byte in the body. (LP: #1553888) + - Don't collapse multipart with a single sub-part inside multipart/signed parts. (LP: #1551075) -- cgit v1.2.3