From bc4c386d6d09091cb433b5348deac82c7531197f Mon Sep 17 00:00:00 2001 From: Mike Auty Date: Sat, 3 Jun 2017 12:41:18 +0100 Subject: [PATCH] Fix a multiprocessing issue (and tidy away the kwargs). By not passing the arguments from exceptions down to the base class Exception, it causes an issue when they are pickled to be passed between processes. For more information, see http://bugs.python.org/issue1692335. --- volatility/framework/exceptions.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/volatility/framework/exceptions.py b/volatility/framework/exceptions.py index d62ae85a2..8df4abce5 100644 --- a/volatility/framework/exceptions.py +++ b/volatility/framework/exceptions.py @@ -21,8 +21,8 @@ class SymbolError(VolatilityException): class InvalidAddressException(VolatilityException): """Thrown when an address is not valid in the space it was requested""" - def __init__(self, layer_name, invalid_address, *args, **kwargs): - super().__init__(*args, **kwargs) + def __init__(self, layer_name, invalid_address, *args): + super().__init__(layer_name, invalid_address, *args) self.invalid_address = invalid_address self.layer_name = layer_name @@ -33,8 +33,8 @@ class PagedInvalidAddressException(InvalidAddressException): Includes the invalid address and the number of bits of the address that are invalid """ - def __init__(self, layer_name, invalid_address, invalid_bits, *args, **kwargs): - super().__init__(layer_name, invalid_address, *args, **kwargs) + def __init__(self, layer_name, invalid_address, invalid_bits, *args): + super().__init__(layer_name, invalid_address, *args) self.invalid_bits = invalid_bits