From 6432a3277d824ce149cf0d105bab6b78a91821a4 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Wed, 13 May 2020 11:10:04 -0700
Subject: Fix potential ValueError in MailList.CheckPending.
---
Mailman/MailList.py | 7 +++----
NEWS | 9 ++++++++-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 9e6bbcb6..01a5a915 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2020 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -846,9 +846,8 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin,
for k, v in pends.items():
if k in ('evictions', 'version'):
continue
- op, data = v
- if (op == Pending.SUBSCRIPTION and
- data.address.lower() == email.lower()):
+ if (v[0] == Pending.SUBSCRIPTION and
+ v[1].address.lower() == email.lower()):
return True
return False
diff --git a/NEWS b/NEWS
index 9208567a..602c2d53 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,17 @@
-*- coding: iso-8859-1 -*-
Mailman - The GNU Mailing List Management System
-Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
+Copyright (C) 1998-2020 by the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Here is a history of user visible changes to Mailman.
+2.1.34 (xx-xxx-xxxx)
+
+ Bug Fixes and other patches
+
+ - The fix for LP: #1859104 can result in ValueError being thrown on
+ attempts to subscribe to a list. This is fixed. (LP: #1878458)
+
2.1.33 (07-May-2020)
Security
--
cgit v1.2.3