summaryrefslogtreecommitdiff
path: root/Lib/xmlrpc
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2012-02-18 15:02:10 +0100
committerCharles-François Natali <neologix@free.fr>2012-02-18 15:02:10 +0100
commit3ccc918b4addd3c189c4214f5283fa9aae980f41 (patch)
tree07b9755d7ba012247adae0ae6751e4046336228c /Lib/xmlrpc
parent93abdd1ab80b014a32a97342c263cf6d623d4ce6 (diff)
parentcd96b4f1ff4dd3a97eedbcea8a837388c0cb8345 (diff)
downloadcpython-git-3ccc918b4addd3c189c4214f5283fa9aae980f41.tar.gz
Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in SimpleXMLRPCServer
upon malformed POST request.
Diffstat (limited to 'Lib/xmlrpc')
-rw-r--r--Lib/xmlrpc/server.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py
index bf22aa96b7..fc3fa4b9f9 100644
--- a/Lib/xmlrpc/server.py
+++ b/Lib/xmlrpc/server.py
@@ -476,7 +476,10 @@ class SimpleXMLRPCRequestHandler(BaseHTTPRequestHandler):
L = []
while size_remaining:
chunk_size = min(size_remaining, max_chunk_size)
- L.append(self.rfile.read(chunk_size))
+ chunk = self.rfile.read(chunk_size)
+ if not chunk:
+ break
+ L.append(chunk)
size_remaining -= len(L[-1])
data = b''.join(L)