diff options
| author | Jeremy T. Bouse <jbouse@debian.org> | 2013-05-25 00:04:32 -0400 |
|---|---|---|
| committer | Jeremy T. Bouse <jbouse@debian.org> | 2013-05-25 00:04:32 -0400 |
| commit | 1a716ed46d1d556d4ba6798608ab498320acd886 (patch) | |
| tree | dbcb23de26387e312f7ea09085330eca90e15853 /paramiko/message.py | |
| parent | a88b8c8c0f591a3bfa8d7984343a27815184f495 (diff) | |
| download | python-paramiko-1a716ed46d1d556d4ba6798608ab498320acd886.tar python-paramiko-1a716ed46d1d556d4ba6798608ab498320acd886.tar.gz | |
Imported Upstream version 1.10.1upstream/1.10.1
Diffstat (limited to 'paramiko/message.py')
| -rw-r--r-- | paramiko/message.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/paramiko/message.py b/paramiko/message.py index 366c43c..47acc34 100644 --- a/paramiko/message.py +++ b/paramiko/message.py @@ -110,7 +110,8 @@ class Message (object): @rtype: string """ b = self.packet.read(n) - if len(b) < n: + max_pad_size = 1<<20 # Limit padding to 1 MB + if len(b) < n and n < max_pad_size: return b + '\x00' * (n - len(b)) return b |