traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Neal Norwitz 2007-10-23 05:35:11 +00:00
parent 35a9f908c8
commit 1046af6f59
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/smtpd.py
View File

@ -221,7 +221,7 @@ class SMTPChannel(asynchat.async_chat):
def smtp_MAIL(self, arg): def smtp_MAIL(self, arg):
print >> DEBUGSTREAM, '===> MAIL', arg print >> DEBUGSTREAM, '===> MAIL', arg
address = self.__getaddr('FROM:', arg) address = self.__getaddr('FROM:', arg) if arg else None
if not address: if not address:
self.push('501 Syntax: MAIL FROM:<address>') self.push('501 Syntax: MAIL FROM:<address>')
return return

2
Misc/NEWS
View File

@ -32,6 +32,8 @@ Core and builtins
Library Library
------- -------
- Bug #1307: Fix smtpd so it doesn't raise an exception when there is no arg.
- ctypes will now work correctly on 32-bit systems when Python is - ctypes will now work correctly on 32-bit systems when Python is
configured with --with-system-ffi. configured with --with-system-ffi.