From bf7b73081b17eda9589e5cd6ee0242912633d306 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
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 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Mailman/Queue')

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
-- 
cgit v1.2.3