summaryrefslogtreecommitdiffstats
path: root/Lib/xmlrpc
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2012-02-18 13:42:57 (GMT)
committerCharles-François Natali <neologix@free.fr>2012-02-18 13:42:57 (GMT)
commitec1712a1662282c909b4cd4cc0c7486646bc9246 (patch)
tree772508e22ec0530c9d469ff7e21be244beebffea /Lib/xmlrpc
parent2f7b286a8ce74fbfaa8d2170d457308c6a62e870 (diff)
downloadcpython-ec1712a1662282c909b4cd4cc0c7486646bc9246.zip
cpython-ec1712a1662282c909b4cd4cc0c7486646bc9246.tar.gz
cpython-ec1712a1662282c909b4cd4cc0c7486646bc9246.tar.bz2
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 24d8a6a..93df561 100644
--- a/Lib/xmlrpc/server.py
+++ b/Lib/xmlrpc/server.py
@@ -449,7 +449,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)