From 6d582a8a68a601438a56f378936d5ebc0100f07e Mon Sep 17 00:00:00 2001 From: Andrew Case Date: Tue, 18 Dec 2018 13:19:49 -0600 Subject: [PATCH] remove while 1 and broad exception catching --- .../framework/symbols/mac/extensions/__init__.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/volatility/framework/symbols/mac/extensions/__init__.py b/volatility/framework/symbols/mac/extensions/__init__.py index adb5b5257..767b896e1 100644 --- a/volatility/framework/symbols/mac/extensions/__init__.py +++ b/volatility/framework/symbols/mac/extensions/__init__.py @@ -223,20 +223,22 @@ class vm_map_entry(generic.GenericIntelProcess): # based on find_vnode_object vnode_object = self.get_object().get_map_object() - while 1: + found_end = False + + while not found_end: try: tmp_vnode_object = vnode_object.shadow.dereference() except exceptions.PagedInvalidAddressException: break if tmp_vnode_object.vol.offset == 0: - break - - vnode_object = tmp_vnode_object + found_end = True + else: + vnode_object = tmp_vnode_object try: ops = vnode_object.pager.mo_pager_ops.dereference() - except Exception as e: #exceptions.PagedInvalidAddressException: + except exceptions.PagedInvalidAddressException: return None found = False