Bug #1430298: It is now possible to send a mail with an empty

return address using smtplib.

1 files changed, 4 insertions, 1 deletions

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 57605a96da..71d25fda26 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -175,8 +175,11 @@ def quoteaddr(addr):
     except AttributeError:
         pass
     if m == (None, None): # Indicates parse failure or AttributeError
-        #something weird here.. punt -ddm
+        # something weird here.. punt -ddm
         return "<%s>" % addr
+    elif m is None:
+        # the sender wants an empty return address
+        return "<>"
     else:
         return "<%s>" % m