dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #116 from mvschaik/patch-1 

Limit memory allocation of get_bytes to 1MB
This commit is contained in:
Jeff Forcier 2013-02-27 15:31:20 -08:00
parent e761502e8e 3bbcf808d8
commit 37d0247301
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
paramiko/message.py
View File

@ -110,7 +110,8 @@ class Message (object):
@rtype: string @rtype: string
""" """
b = self.packet.read(n) 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 + '\x00' * (n - len(b))
return b return b