diff options
| author | Georg Brandl <georg@python.org> | 2013-10-27 06:46:09 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-27 06:46:09 (GMT) |
| commit | b89b5df9c9aa2e45bfffa95f5e3deb6234232c93 (patch) | |
| tree | fd9bfa96b2e5cbc69acc235dd15dd682c10fc00e /Lib/imaplib.py | |
| parent | 68457be619b919127d0858322ce84e901fd89728 (diff) | |
| parent | 045ee06ae91a1503a8d512929c54e16deabfe9a8 (diff) | |
| download | cpython-b89b5df9c9aa2e45bfffa95f5e3deb6234232c93.zip cpython-b89b5df9c9aa2e45bfffa95f5e3deb6234232c93.tar.gz cpython-b89b5df9c9aa2e45bfffa95f5e3deb6234232c93.tar.bz2 | |
merge with 3.3
Diffstat (limited to 'Lib/imaplib.py')
| -rw-r--r-- | Lib/imaplib.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Lib/imaplib.py b/Lib/imaplib.py index 42353bb..0994f2b 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -43,6 +43,15 @@ IMAP4_PORT = 143 IMAP4_SSL_PORT = 993 AllowedVersions = ('IMAP4REV1', 'IMAP4') # Most recent first +# Maximal line length when calling readline(). This is to prevent +# reading arbitrary length lines. RFC 3501 and 2060 (IMAP 4rev1) +# don't specify a line length. RFC 2683 however suggests limiting client +# command lines to 1000 octets and server command lines to 8000 octets. +# We have selected 10000 for some extra margin and since that is supposedly +# also what UW and Panda IMAP does. +_MAXLINE = 10000 + + # Commands Commands = { @@ -256,7 +265,10 @@ class IMAP4: def readline(self): """Read line from remote.""" - return self.file.readline() + line = self.file.readline(_MAXLINE + 1) + if len(line) > _MAXLINE: + raise self.error("got more than %d bytes" % _MAXLINE) + return line def send(self, data): |