commit 1046af6f594d79a7447d1410aee206f5d509ccc5
author Neal Norwitz <nnorwitz@gmail.com> Tue Oct 23 05:35:11 2007 +0000
committer Neal Norwitz <nnorwitz@gmail.com> Tue Oct 23 05:35:11 2007 +0000
tree 6a624132268d28eeab354b9981b49402bec1218d
parent 35a9f908c8e97ed453e3673af8375acce24839f5

Backport 58594:
Issue #1307, patch by Derek Shockey.
When "MAIL" is received without args, an exception happens instead of
sending a 501 syntax error response.

Lib/smtpd.py

diff --git a/Lib/smtpd.py b/Lib/smtpd.py
index c656ec7..4aa3476 100755
--- a/Lib/smtpd.py
+++ b/Lib/smtpd.py
@@ -221,7 +221,7 @@
 
     def smtp_MAIL(self, arg):
         print >> DEBUGSTREAM, '===> MAIL', arg
-        address = self.__getaddr('FROM:', arg)
+        address = self.__getaddr('FROM:', arg) if arg else None
         if not address:
             self.push('501 Syntax: MAIL FROM:<address>')
             return