mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-04 22:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-31247: xmlrpc.server: break reference cycle (#3166) (#3168)

Browse source 
xmlrpc.server now explicitly breaks reference cycles when using
sys.exc_info() in code handling exceptions.
(cherry picked from commit 84524454d0)
This commit is contained in:
Victor Stinner 2017-08-21 18:35:04 +02:00 • committed by GitHub
parent 24c0c5b48c
commit 12a3e343e1
2 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/xmlrpc/server.py
View file

@ -264,10 +264,14 @@ class SimpleXMLRPCDispatcher:
except: except:
# report exception back to server # report exception back to server
exc_type, exc_value, exc_tb = sys.exc_info() exc_type, exc_value, exc_tb = sys.exc_info()
try:
response = dumps( response = dumps(
Fault(1, "%s:%s" % (exc_type, exc_value)), Fault(1, "%s:%s" % (exc_type, exc_value)),
encoding=self.encoding, allow_none=self.allow_none, encoding=self.encoding, allow_none=self.allow_none,
) )
finally:
# Break reference cycle
exc_type = exc_value = exc_tb = None
return response.encode(self.encoding, 'xmlcharrefreplace') return response.encode(self.encoding, 'xmlcharrefreplace')
@ -359,10 +363,14 @@ class SimpleXMLRPCDispatcher:
) )
except: except:
exc_type, exc_value, exc_tb = sys.exc_info() exc_type, exc_value, exc_tb = sys.exc_info()
try:
results.append( results.append(
{'faultCode' : 1, {'faultCode' : 1,
'faultString' : "%s:%s" % (exc_type, exc_value)} 'faultString' : "%s:%s" % (exc_type, exc_value)}
) )
finally:
# Break reference cycle
exc_type = exc_value = exc_tb = None
return results return results
def _dispatch(self, method, params): def _dispatch(self, method, params):
@ -624,10 +632,14 @@ class MultiPathXMLRPCServer(SimpleXMLRPCServer):
# (each dispatcher should have handled their own # (each dispatcher should have handled their own
# exceptions) # exceptions)
exc_type, exc_value = sys.exc_info()[:2] exc_type, exc_value = sys.exc_info()[:2]
try:
response = dumps( response = dumps(
Fault(1, "%s:%s" % (exc_type, exc_value)), Fault(1, "%s:%s" % (exc_type, exc_value)),
encoding=self.encoding, allow_none=self.allow_none) encoding=self.encoding, allow_none=self.allow_none)
response = response.encode(self.encoding, 'xmlcharrefreplace') response = response.encode(self.encoding, 'xmlcharrefreplace')
finally:
# Break reference cycle
exc_type = exc_value = None
return response return response
class CGIXMLRPCRequestHandler(SimpleXMLRPCDispatcher): class CGIXMLRPCRequestHandler(SimpleXMLRPCDispatcher):

2
Misc/NEWS.d/next/Library/2017-08-21-17-50-27.bpo-31247.8S3zJp.rst Normal file
View file

@ -0,0 +1,2 @@
xmlrpc.server now explicitly breaks reference cycles when using
sys.exc_info() in code handling exceptions.