Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Lib/test/test_xmlrpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,13 @@ def test_loads_unsupported(self):
'</struct></value></param></params>')
self.assertRaises(ResponseError, xmlrpclib.loads, data)

def test_loads_malformed_struct(self):
ResponseError = xmlrpclib.ResponseError
data = ('<params><param><value><struct>'
'<member><name>k</name></member>'
'</struct></value></param></params>')
self.assertRaises(ResponseError, xmlrpclib.loads, data)

def check_loads(self, s, value, **kwargs):
dump = '<params><param><value>%s</value></param></params>' % s
result, m = xmlrpclib.loads(dump, **kwargs)
Expand Down
2 changes: 2 additions & 0 deletions Lib/xmlrpc/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,8 @@ def end_struct(self, data):
# map structs to Python dictionaries
dict = {}
items = self._stack[mark:]
if len(items) % 2:
raise ResponseError()
for i in range(0, len(items), 2):
dict[items[i]] = items[i+1]
self._stack[mark:] = [dict]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :func:`xmlrpc.client.loads` raising :exc:`IndexError` instead of
``ResponseError`` for a malformed ``<struct>``. Patch by tonghuaroot.
Loading