[Python API] Replace bare "except:" with "except Exception:" to fix signal propagation

Author: negasora

python/architecture.py

@@ -1086,42 +1086,42 @@ def _init(self, ctxt, handle):
 	def _get_endianness(self, ctxt):
 		try:
 			return self.endianness
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_endianness")
 			return Endianness.LittleEndian
 
 	def _get_address_size(self, ctxt):
 		try:
 			return self.address_size
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_address_size")
 			return 8
 
 	def _get_default_integer_size(self, ctxt):
 		try:
 			return self.default_int_size
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_default_integer_size")
 			return 4
 
 	def _get_instruction_alignment(self, ctxt):
 		try:
 			return self.instr_alignment
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_instruction_alignment")
 			return 1
 
 	def _get_max_instruction_length(self, ctxt):
 		try:
 			return self.max_instr_length
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_max_instruction_length")
 			return 16
 
 	def _get_opcode_display_length(self, ctxt):
 		try:
 			return self.opcode_display_length
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_opcode_display_length")
 			return 8
 
@@ -1130,7 +1130,7 @@ def _get_associated_arch_by_address(self, ctxt, addr):
 			result, new_addr = self.get_associated_arch_by_address(addr[0])
 			addr[0] = new_addr
 			return ctypes.cast(result.handle, ctypes.c_void_p).value
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_associated_arch_by_address")
 			return ctypes.cast(self.handle, ctypes.c_void_p).value
 
@@ -1157,7 +1157,7 @@ def _get_instruction_info(self, ctxt, data, addr, max_len, result):
 				else:
 					result[0].branchArch[i] = arch.handle
 			return True
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_instruction_info")
 			return False
 
@@ -1176,7 +1176,7 @@ def _get_instruction_text(self, ctxt, data, addr, length, result, count):
 			ptr = ctypes.cast(token_buf, ctypes.c_void_p)
 			self._pending_token_lists[ptr.value] = (ptr.value, token_buf)
 			return True
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_instruction_text")
 			return False
 
@@ -1196,7 +1196,7 @@ def _get_instruction_text_with_context(self, ctxt, data, addr, length, context_t
 			ptr = ctypes.cast(token_buf, ctypes.c_void_p)
 			self._pending_token_lists[ptr.value] = (ptr.value, token_buf)
 			return True
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_instruction_text_with_context")
 			return False
 
@@ -1229,30 +1229,30 @@ def _analyze_basic_blocks(self, ctx, func, ptr_bn_bb_context):
 			bn_bb_context = ptr_bn_bb_context.contents
 			context = BasicBlockAnalysisContext.from_core_struct(bn_bb_context)
 			self.analyze_basic_blocks(function.Function(handle=core.BNNewFunctionReference(func)), context)
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._analyze_basic_blocks")
 
 	def _lift_function(self, ctx, func, ptr_bn_fl_context):
 		try:
 			bn_fl_context = ptr_bn_fl_context.contents
 			context = FunctionLifterContext.from_core_struct(func, bn_fl_context)
 			return self.lift_function(lowlevelil.LowLevelILFunction(arch=self, handle=core.BNNewLowLevelILFunctionReference(func)), context)
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._lift_function")
 			return False
 
 	def _free_function_arch_context(self, ctx, context_token):
 		try:
 			self.function_arch_contexts.pop(context_token, None)
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._free_function_arch_context")
 
 	def _get_register_name(self, ctxt, reg):
 		try:
 			if reg in self._regs_by_index:
 				return core.BNAllocString(self._regs_by_index[reg])
 			return core.BNAllocString("")
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_register_name")
 			return core.BNAllocString("")
 
@@ -1261,7 +1261,7 @@ def _get_flag_name(self, ctxt, flag):
 			if flag in self._flags_by_index:
 				return core.BNAllocString(self._flags_by_index[flag])
 			return core.BNAllocString("")
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_flag_name")
 			return core.BNAllocString("")
 
@@ -1270,7 +1270,7 @@ def _get_flag_write_type_name(self, ctxt, write_type: FlagWriteTypeIndex):
 			if write_type in self._flag_write_types_by_index:
 				return core.BNAllocString(self._flag_write_types_by_index[write_type])
 			return core.BNAllocString("")
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_flag_write_type_name")
 			return core.BNAllocString("")
 
@@ -1279,7 +1279,7 @@ def _get_semantic_flag_class_name(self, ctxt, sem_class):
 			if sem_class in self._semantic_flag_classes_by_index:
 				return core.BNAllocString(self._semantic_flag_classes_by_index[sem_class])
 			return core.BNAllocString("")
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_semantic_flag_class_name")
 			return core.BNAllocString("")
 
@@ -1288,7 +1288,7 @@ def _get_semantic_flag_group_name(self, ctxt, sem_group):
 			if sem_group in self._semantic_flag_groups_by_index:
 				return core.BNAllocString(self._semantic_flag_groups_by_index[sem_group])
 			return core.BNAllocString("")
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_semantic_flag_group_name")
 			return core.BNAllocString("")
 
@@ -1425,7 +1425,7 @@ def _get_flags_required_for_semantic_flag_group(self, ctxt, sem_group, count):
 			result = ctypes.cast(flag_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, flag_buf)
 			return result.value
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_flags_required_for_semantic_flag_group")
 			count[0] = 0
 			return None
@@ -1446,7 +1446,7 @@ def _get_flag_conditions_for_semantic_flag_group(self, ctxt, sem_group, count):
 			result = ctypes.cast(cond_buf, ctypes.c_void_p)
 			self._pending_condition_lists[result.value] = (result, cond_buf)
 			return result.value
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_flag_conditions_for_semantic_flag_group")
 			count[0] = 0
 			return None
@@ -1473,7 +1473,7 @@ def _get_flags_written_by_flag_write_type(self, ctxt, write_type, count):
 			result = ctypes.cast(flag_buf, ctypes.c_void_p)
 			self._pending_reg_lists[result.value] = (result, flag_buf)
 			return result.value
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_flags_written_by_flag_write_type")
 			count[0] = 0
 			return None
@@ -1484,7 +1484,7 @@ def _get_semantic_class_for_flag_write_type(self, ctxt, write_type):
 				return self._semantic_class_for_flag_write_type[write_type]
 			else:
 				return 0
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_semantic_class_for_flag_write_type")
 			return 0
 
@@ -1512,7 +1512,7 @@ def _get_flag_write_low_level_il(self, ctxt, op, size, write_type, flag, operand
 			    op, size, write_type_name, flag_name, operand_list,
 			    lowlevelil.LowLevelILFunction(self, core.BNNewLowLevelILFunctionReference(il))
 			)
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_flag_write_low_level_il")
 			return False
 
@@ -1625,7 +1625,7 @@ def _get_register_stack_name(self, ctxt, reg_stack):
 			if reg_stack in self._reg_stacks_by_index:
 				return core.BNAllocString(self._reg_stacks_by_index[reg_stack])
 			return core.BNAllocString("")
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_register_stack_name")
 			return core.BNAllocString("")
 
@@ -1681,7 +1681,7 @@ def _get_intrinsic_name(self, ctxt, intrinsic):
 			if intrinsic in self._intrinsics_by_index:
 				return core.BNAllocString(self._intrinsics_by_index[intrinsic][0])
 			return core.BNAllocString("")
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_intrinsic_name")
 			return core.BNAllocString("")
 
@@ -1715,7 +1715,7 @@ def _get_intrinsic_inputs(self, ctxt, intrinsic, count):
 				return result.value
 			count[0] = 0
 			return None
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_intrinsic_inputs")
 			count[0] = 0
 			return None
@@ -1747,7 +1747,7 @@ def _get_intrinsic_outputs(self, ctxt, intrinsic, count):
 				return result.value
 			count[0] = 0
 			return None
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._get_intrinsic_outputs")
 			count[0] = 0
 			return None
@@ -1768,7 +1768,7 @@ def _free_type_list(self, ctxt, buf_raw, length):
 	def _can_assemble(self, ctxt):
 		try:
 			return self.can_assemble
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._can_assemble")
 			return False
 
@@ -1790,7 +1790,7 @@ def _assemble(self, ctxt, code, addr, result, errors):
 			log_debug_for_exception("Assemble failed")
 			errors[0] = core.BNAllocString(str(e))
 			return False
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._assemble")
 			errors[0] = core.BNAllocString("Unhandled exception during assembly.\n")
 			return False
@@ -1800,7 +1800,7 @@ def _is_never_branch_patch_available(self, ctxt, data, addr, length):
 			buf = ctypes.create_string_buffer(length)
 			ctypes.memmove(buf, data, length)
 			return self.is_never_branch_patch_available(buf.raw, addr)
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._is_never_branch_patch_available")
 			return False
 
@@ -1809,7 +1809,7 @@ def _is_always_branch_patch_available(self, ctxt, data, addr, length):
 			buf = ctypes.create_string_buffer(length)
 			ctypes.memmove(buf, data, length)
 			return self.is_always_branch_patch_available(buf.raw, addr)
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._is_always_branch_patch_available")
 			return False
 
@@ -1818,7 +1818,7 @@ def _is_invert_branch_patch_available(self, ctxt, data, addr, length):
 			buf = ctypes.create_string_buffer(length)
 			ctypes.memmove(buf, data, length)
 			return self.is_invert_branch_patch_available(buf.raw, addr)
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._is_invert_branch_patch_available")
 			return False
 
@@ -1827,7 +1827,7 @@ def _is_skip_and_return_zero_patch_available(self, ctxt, data, addr, length):
 			buf = ctypes.create_string_buffer(length)
 			ctypes.memmove(buf, data, length)
 			return self.is_skip_and_return_zero_patch_available(buf.raw, addr)
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._is_skip_and_return_zero_patch_available")
 			return False
 
@@ -1836,7 +1836,7 @@ def _is_skip_and_return_value_patch_available(self, ctxt, data, addr, length):
 			buf = ctypes.create_string_buffer(length)
 			ctypes.memmove(buf, data, length)
 			return self.is_skip_and_return_value_patch_available(buf.raw, addr)
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._is_skip_and_return_value_patch_available")
 			return False
 
@@ -1851,7 +1851,7 @@ def _convert_to_nop(self, ctxt, data, addr, length):
 				result = result[0:length]
 			ctypes.memmove(data, result, len(result))
 			return True
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._convert_to_nop")
 			return False
 
@@ -1866,7 +1866,7 @@ def _always_branch(self, ctxt, data, addr, length):
 				result = result[0:length]
 			ctypes.memmove(data, result, len(result))
 			return True
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._always_branch")
 			return False
 
@@ -1881,7 +1881,7 @@ def _invert_branch(self, ctxt, data, addr, length):
 				result = result[0:length]
 			ctypes.memmove(data, result, len(result))
 			return True
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._invert_branch")
 			return False
 
@@ -1896,7 +1896,7 @@ def _skip_and_return_value(self, ctxt, data, addr, length, value):
 				result = result[0:length]
 			ctypes.memmove(data, result, len(result))
 			return True
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture._skip_and_return_value")
 			return False
 
@@ -2001,7 +2001,7 @@ def analyze_basic_blocks(self, func: 'function.Function', context: BasicBlockAna
 
 		try:
 			core.BNArchitectureDefaultAnalyzeBasicBlocks(func.handle, context._handle)
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture.analyze_basic_blocks")
 
 	def lift_function(self, func: "lowlevelil.LowLevelILFunction", context: FunctionLifterContext) -> bool:
@@ -2017,7 +2017,7 @@ def lift_function(self, func: "lowlevelil.LowLevelILFunction", context: Function
 
 		try:
 			return core.BNArchitectureDefaultLiftFunction(func.handle, context._handle)
-		except:
+		except Exception:
 			log_error_for_exception("Unhandled Python exception in Architecture.lift_function")
 			return False