Merge branch 'release/v2.0.0' into develop

This commit is contained in:
Mike Auty
2021-01-06 20:59:08 +00:00
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -75,7 +75,7 @@ def setup(app):
break
else:
line_index = len(real_lines)
submodule_lines = real_lines[line_index:]
submodule_lines = [b"\n"] + real_lines[line_index:]
plugins_seen = False
with open(os.path.join(dir, filename), "wb") as contents:
+1 -1
View File
@@ -41,7 +41,7 @@ BANG = "!"
VERSION_MAJOR = 2 # Number of releases of the library with a breaking change
VERSION_MINOR = 0 # Number of changes that only add to the interface
VERSION_PATCH = 0 # Number of changes that do not change the interface
VERSION_SUFFIX = "-beta.1"
VERSION_SUFFIX = ""
PACKAGE_VERSION = ".".join([str(x) for x in [VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH]]) + VERSION_SUFFIX
"""The canonical version of the volatility package"""
@@ -87,11 +87,11 @@ class Handles(interfaces.plugins.PluginInterface):
# is this the right thing to raise here?
if magic is None:
if not has_capstone:
if has_capstone:
raise AttributeError("Unable to find the SAR value for decoding handle table pointers")
else:
raise exceptions.MissingModuleException(
"capstone", "Unable to find the SAR value for decoding handle table pointers")
"capstone", "Requires capstone to find the SAR value for decoding handle table pointers")
offset = self._decode_pointer(handle_table_entry.LowValue, magic)
# print("LowValue: {0:#x} Magic: {1:#x} Offset: {2:#x}".format(handle_table_entry.InfoTable, magic, offset))