Commit 044e733a authored by Jason Madden's avatar Jason Madden

Fix negative lengths when the buffer is not none for py27.

parent b166329e
...@@ -282,6 +282,8 @@ class SSLSocket(socket): ...@@ -282,6 +282,8 @@ class SSLSocket(socket):
raise ValueError("Read on closed or unwrapped SSL socket.") raise ValueError("Read on closed or unwrapped SSL socket.")
if len == 0: if len == 0:
return b'' if buffer is None else 0 return b'' if buffer is None else 0
# Negative lengths are handled natively when the buffer is None
# to raise a ValueError
try: try:
if buffer is not None: if buffer is not None:
return self._sslobj.read(len, buffer) return self._sslobj.read(len, buffer)
......
...@@ -305,7 +305,7 @@ class SSLSocket(socket): ...@@ -305,7 +305,7 @@ class SSLSocket(socket):
raise ValueError("Read on closed or unwrapped SSL socket.") raise ValueError("Read on closed or unwrapped SSL socket.")
if len == 0: if len == 0:
return b'' if buffer is None else 0 return b'' if buffer is None else 0
if len < 0: if len < 0 and buffer is None:
# This is handled natively in python 2.7.12+ # This is handled natively in python 2.7.12+
raise ValueError("Negative read length") raise ValueError("Negative read length")
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment