Skip to content

Commit 9b53767

Browse files
committed
Core: Fix up more scanning notes/warnings
1 parent b98a311 commit 9b53767

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

development/mac-kdk/parse_pbzx2.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ def seekread(f, offset = None, length = 0, relative = True):
1717
f.seek(offset, [0, 1, 2][relative])
1818
if length:
1919
return f.read(length)
20+
return None
2021

2122

2223
def parse_pbzx(pbzx_path):
@@ -64,10 +65,6 @@ def parse_pbzx(pbzx_path):
6465
xar_f.write(f_content)
6566
if tail != 'YZ':
6667
raise RuntimeError("Error: Footer is not xar file footer")
67-
try:
68-
xar_f.close()
69-
except IOError:
70-
pass
7168

7269

7370
def main():

volatility3/framework/layers/vmware.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ def stack(cls,
154154

155155
vmss_success = False
156156
with contextlib.suppress(IOError):
157-
_ = resources.ResourceAccessor().open(vmss).read(10)
157+
with resources.ResourceAccessor().open(vmss) as fp:
158+
_ = fp.read(10)
158159
context.config[interfaces.configuration.path_join(current_config_path, "location")] = vmss
159160
context.layers.add_layer(physical.FileLayer(context, current_config_path, current_layer_name))
160161
vmss_success = True

volatility3/framework/objects/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -747,10 +747,8 @@ def _check_members(cls, members: Dict[str, Tuple[int, interfaces.objects.Templat
747747
if isinstance(cls, agg_type):
748748
agg_name = agg_type.__name__
749749

750-
assert isinstance(members, collections.abc.Mapping)
751-
f"{agg_name} members parameter must be a mapping: {type(members)}"
752-
assert all([(isinstance(member, tuple) and len(member) == 2) for member in members.values()])
753-
f"{agg_name} members must be a tuple of relative_offsets and templates"
750+
assert isinstance(members, collections.abc.Mapping), f"{agg_name} members parameter must be a mapping: {type(members)}"
751+
assert all([(isinstance(member, tuple) and len(member) == 2) for member in members.values()]), f"{agg_name} members must be a tuple of relative_offsets and templates"
754752

755753
def member(self, attr: str = 'member') -> object:
756754
"""Specifically named method for retrieving members."""

volatility3/framework/plugins/windows/registry/userassist.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ def __init__(self, *args, **kwargs):
3333
self._reg_table_name = None
3434
self._win7 = None
3535
# taken from http://msdn.microsoft.com/en-us/library/dd378457%28v=vs.85%29.aspx
36-
self._folder_guids = json.load(open(os.path.join(os.path.dirname(__file__), "userassist.json"), "rb"))
36+
try:
37+
with open(os.path.join(os.path.dirname(__file__), "userassist.json"), "rb") as fp:
38+
self._folder_guids = json.load(fp)
39+
except IOError:
40+
vollog.error("Usersassist data file not found")
3741

3842
@classmethod
3943
def get_requirements(cls) -> List[interfaces.configuration.RequirementInterface]:

volatility3/framework/symbols/linux/extensions/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def get_symbol(self, wanted_sym_name):
128128
sym_addr = sym.st_value
129129
if wanted_sym_name == sym_name:
130130
return sym_addr
131-
return # Generation finished
131+
return None
132132

133133
@property
134134
def section_symtab(self):

volatility3/framework/symbols/windows/pdbconv.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,7 @@ def retreive_pdb(self,
934934
if progress_callback is not None:
935935
progress_callback(100, f"Downloading {url + suffix}")
936936
if result is None:
937+
result.close()
937938
return None
938939
return url + suffix
939940

0 commit comments

Comments
 (0)