From b3b302042d527deeeb87605ad22e7185d0beae20 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Wed, 22 Feb 2017 22:05:56 -0800
Subject: Fixed an uncaught TypeError in the subscribe CGI.

---
 Mailman/Cgi/subscribe.py | 2 +-
 NEWS                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py
index 36d25fa2..b2f8925e 100755
--- a/Mailman/Cgi/subscribe.py
+++ b/Mailman/Cgi/subscribe.py
@@ -185,7 +185,7 @@ def process_form(mlist, doc, cgidata, lang):
     if digestflag:
         try:
             digest = int(digestflag)
-        except ValueError:
+        except (TypeError, ValueError):
             digest = 0
     else:
         digest = mlist.digest_is_default
diff --git a/NEWS b/NEWS
index dc9c155a..fde02dd4 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,8 @@ Here is a history of user visible changes to Mailman.
 
   Bug fixes and other patches
 
+    - Fixed an uncaught TypeError in the subscribe CGI.  (LP: #1667215)
+
     - Added recognition for a newly seen mailEnable bounce.
 
     - Fixed an uncaught NotAMemberError when a member is removed before a
-- 
cgit v1.2.3