Merge branch 'segments' into dev

1 files changed, 241 insertions, 72 deletions

diff --git a/python/__init__.py b/python/__init__.py
index bfd2358f..70267678 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -300,7 +300,7 @@ class FileMetadata(object):
 		view = core.BNGetFileViewOfType(self.handle, "Raw")
 		if view is None:
 			return None
-		return BinaryView(self, handle = view)
+		return BinaryView(file_metadata = self, handle = view)
 
 	@property
 	def saved(self):
@@ -455,7 +455,7 @@ class FileMetadata(object):
 				lambda ctxt, cur, total: progress_func(cur, total)))
 		if view is None:
 			return None
-		return BinaryView(self, handle = view)
+		return BinaryView(file_metadata = self, handle = view)
 
 	def save_auto_snapshot(self, progress_func = None):
 		if progress_func is None:
@@ -474,7 +474,7 @@ class FileMetadata(object):
 			view = core.BNCreateBinaryViewOfType(view_type, self.raw.handle)
 			if view is None:
 				return None
-		return BinaryView(self, handle = view)
+		return BinaryView(file_metadata = self, handle = view)
 
 	def __setattr__(self, name, value):
 		try:
@@ -812,7 +812,7 @@ class BinaryViewType(object):
 		view = core.BNCreateBinaryViewOfType(self.handle, data.handle)
 		if view is None:
 			return None
-		return BinaryView(data.file, handle = view)
+		return BinaryView(file_metadata = data.file, handle = view)
 
 	def open(self, src, file_metadata = None):
 		data = BinaryView.open(src, file_metadata)
@@ -924,6 +924,64 @@ class DataVariable(object):
 	def __repr__(self):
 		return "<var 0x%x: %s>" % (self.address, str(self.type))
 
+class Segment(object):
+	def __init__(self, start, length, data_offset, data_length, flags):
+		self.start = start
+		self.length = length
+		self.data_offset = data_offset
+		self.data_length = data_length
+		self.flags = flags
+
+	@property
+	def end(self):
+		return self.start + self.length
+
+	def __len__(self):
+		return self.length
+
+	def __repr__(self):
+		return "<segment: %#x-%#x, %s%s%s>" % (self.start, self.end,
+			"r" if (self.flags & core.SegmentReadable) != 0 else "-",
+			"w" if (self.flags & core.SegmentWritable) != 0 else "-",
+			"x" if (self.flags & core.SegmentExecutable) != 0 else "-")
+
+class Section(object):
+	def __init__(self, name, section_type, start, length, linked_section, info_section, info_data, align, entry_size):
+		self.name = name
+		self.type = section_type
+		self.start = start
+		self.length = length
+		self.linked_section = linked_section
+		self.info_section = info_section
+		self.info_data = info_data
+		self.align = align
+		self.entry_size = entry_size
+
+	@property
+	def end(self):
+		return self.start + self.length
+
+	def __len__(self):
+		return self.length
+
+	def __repr__(self):
+		return "<section %s: %#x-%#x>" % (self.name, self.start, self.end)
+
+class AddressRange(object):
+	def __init__(self, start, end):
+		self.start = start
+		self.end = end
+
+	@property
+	def length(self):
+		return self.end - self.start
+
+	def __len__(self):
+		return self.end - self.start
+
+	def __repr__(self):
+		return "<%#x-%#x>" % (self.start, self.end)
+
 class _BinaryViewAssociatedDataStore(_AssociatedDataStore):
 	_defaults = {}
 
@@ -982,7 +1040,7 @@ class BinaryView(object):
 	next_address = 0
 	_associated_data = {}
 
-	def __init__(self, file_metadata = None, handle = None):
+	def __init__(self, file_metadata = None, parent_view = None, handle = None):
 		if handle is not None:
 			self.handle = core.handle_of_type(handle, core.BNBinaryView)
 			if file_metadata is None:
@@ -1020,7 +1078,9 @@ class BinaryView(object):
 			self._cb.getAddressSize = self._cb.getAddressSize.__class__(self._get_address_size)
 			self._cb.save = self._cb.save.__class__(self._save)
 			self.file = file_metadata
-			self.handle = core.BNCreateCustomBinaryView(self.__class__.name, file_metadata.handle, self._cb)
+			if parent_view is not None:
+				parent_view = parent_view.handle
+			self.handle = core.BNCreateCustomBinaryView(self.__class__.name, file_metadata.handle, parent_view, self._cb)
 		self.notifications = {}
 		self.next_address = None  # Do NOT try to access view before init() is called, use placeholder
 
@@ -1042,7 +1102,7 @@ class BinaryView(object):
 	def _create(cls, ctxt, data):
 		try:
 			file_metadata = FileMetadata(handle = core.BNGetFileForView(data))
-			view = cls(BinaryView(file_metadata, handle = core.BNNewViewReference(data)))
+			view = cls(BinaryView(file_metadata = file_metadata, handle = core.BNNewViewReference(data)))
 			if view is None:
 				return None
 			return ctypes.cast(core.BNNewViewReference(view.handle), ctypes.c_void_p).value
@@ -1053,7 +1113,7 @@ class BinaryView(object):
 	@classmethod
 	def _is_valid_for_data(cls, ctxt, data):
 		try:
-			return cls.is_valid_for_data(BinaryView(None, handle = core.BNNewViewReference(data)))
+			return cls.is_valid_for_data(BinaryView(handle = core.BNNewViewReference(data)))
 		except:
 			log_error(traceback.format_exc())
 			return False
@@ -1071,7 +1131,7 @@ class BinaryView(object):
 			view = core.BNCreateBinaryDataViewFromFilename(file_metadata.handle, str(src))
 		if view is None:
 			return None
-		result = BinaryView(file_metadata, handle = view)
+		result = BinaryView(file_metadata = file_metadata, handle = view)
 		return result
 
 	@classmethod
@@ -1086,7 +1146,7 @@ class BinaryView(object):
 			view = core.BNCreateBinaryDataViewFromBuffer(file_metadata.handle, buf.handle)
 		if view is None:
 			return None
-		result = BinaryView(file_metadata, handle = view)
+		result = BinaryView(file_metadata = file_metadata, handle = view)
 		return result
 
 	@classmethod
@@ -1114,6 +1174,14 @@ class BinaryView(object):
 			core.BNFreeFunctionList(funcs, count.value)
 
 	@property
+	def parent_view(self):
+		"""View that contains the raw data used by this view (read-only)"""
+		result = core.BNGetParentView(self.handle)
+		if result is None:
+			return None
+		return BinaryView(handle = result)
+
+	@property
 	def modified(self):
 		"""boolean modification state of the BinaryView (read/write)"""
 		return self.file.modified
@@ -1311,6 +1379,42 @@ class BinaryView(object):
 		return result
 
 	@property
+	def segments(self):
+		"""List of segments (read-only)"""
+		count = ctypes.c_ulonglong(0)
+		segment_list = core.BNGetSegments(self.handle, count)
+		result = []
+		for i in xrange(0, count.value):
+			result.append(Segment(segment_list[i].start, segment_list[i].length,
+				segment_list[i].dataOffset, segment_list[i].dataLength, segment_list[i].flags))
+		core.BNFreeSegmentList(segment_list)
+		return result
+
+	@property
+	def sections(self):
+		"""List of sections (read-only)"""
+		count = ctypes.c_ulonglong(0)
+		section_list = core.BNGetSections(self.handle, count)
+		result = {}
+		for i in xrange(0, count.value):
+			result[section_list[i].name] = Section(section_list[i].name, section_list[i].type, section_list[i].start,
+				section_list[i].length, section_list[i].linkedSection, section_list[i].infoSection,
+				section_list[i].infoData, section_list[i].align, section_list[i].entrySize)
+		core.BNFreeSectionList(section_list, count.value)
+		return result
+
+	@property
+	def allocated_ranges(self):
+		"""List of valid address ranges for this view (read-only)"""
+		count = ctypes.c_ulonglong(0)
+		range_list = core.BNGetAllocatedRanges(self.handle, count)
+		result = []
+		for i in xrange(0, count.value):
+			result.append(AddressRange(range_list[i].start, range_list[i].end))
+		core.BNFreeAddressRanges(range_list)
+		return result
+
+	@property
 	def session_data(self):
 		"""Dictionary object where plugins can store arbitrary data associated with the view"""
 		handle = ctypes.cast(self.handle, ctypes.c_void_p)
@@ -1587,43 +1691,52 @@ class BinaryView(object):
 			return None
 		return ''.join(str(a) for a in txt).strip()
 
-	@abc.abstractmethod
 	def perform_save(self, accessor):
-		raise NotImplementedError
+		if self.parent_view is not None:
+			return self.parent_view.save(accessor)
+		return False
 
 	@abc.abstractmethod
 	def perform_get_address_size(self):
 		raise NotImplementedError
 
-	@abc.abstractmethod
 	def perform_get_length(self):
-		raise NotImplementedError
+		"""
+		``perform_get_length`` implements a query for the size of the virtual address range used by
+		the BinaryView.
+
+		.. note:: This method **may** be overridden by custom BinaryViews. Use ``add_auto_segment`` to provide
+		data without overriding this method.
+		.. warning:: This method **must not** be called directly.
+
+		:return: returns the size of the virtual address range used by the BinaryView.
+		:rtype: int
+		"""
+		return 0
 
-	@abc.abstractmethod
 	def perform_read(self, addr, length):
 		"""
 		``perform_read`` implements a mapping between a virtual address and an absolute file offset, reading
 		``length`` bytes from the rebased address ``addr``.
 
-		.. note:: This method must be overridden by custom BinaryViews if they have segments or the virtual address is\
-		 different from the physical address.
+		.. note:: This method **may** be overridden by custom BinaryViews. Use ``add_auto_segment`` to provide
+		data without overriding this method.
 		.. warning:: This method **must not** be called directly.
 
 		:param int addr: a virtual address to attempt to read from
 		:param int length: the number of bytes to be read
 		:return: length bytes read from addr, should return empty string on error
-		:rtype: int
+		:rtype: str
 		"""
-		raise NotImplementedError
+		return ""
 
-	@abc.abstractmethod
 	def perform_write(self, addr, data):
 		"""
 		``perform_write`` implements a mapping between a virtual address and an absolute file offset, writing
 		the bytes ``data`` to rebased address ``addr``.
 
-		.. note:: This method must be overridden by custom BinaryViews if they have segments or the virtual address is \
-		different from the physical address.
+		.. note:: This method **may** be overridden by custom BinaryViews. Use ``add_auto_segment`` to provide
+		data without overriding this method.
 		.. warning:: This method **must not** be called directly.
 
 		:param int addr: a virtual address
@@ -1631,16 +1744,14 @@ class BinaryView(object):
 		:return: length of data written, should return 0 on error
 		:rtype: int
 		"""
-		raise NotImplementedError
+		return 0
 
-	@abc.abstractmethod
 	def perform_insert(self, addr, data):
 		"""
 		``perform_insert`` implements a mapping between a virtual address and an absolute file offset, inserting
 		the bytes ``data`` to rebased address ``addr``.
 
-		.. note:: This method must be overridden by custom BinaryViews if they have segments or the virtual address is \
-		different from the physical address.
+		.. note:: This method **may** be overridden by custom BinaryViews. If not overridden, inserting is disallowed
 		.. warning:: This method **must not** be called directly.
 
 		:param int addr: a virtual address
@@ -1648,16 +1759,14 @@ class BinaryView(object):
 		:return: length of data inserted, should return 0 on error
 		:rtype: int
 		"""
-		raise NotImplementedError
+		return 0
 
-	@abc.abstractmethod
 	def perform_remove(self, addr, length):
 		"""
 		``perform_remove`` implements a mapping between a virtual address and an absolute file offset, removing
 		``length`` bytes from the rebased address ``addr``.
 
-		.. note:: This method must be overridden by custom BinaryViews if they have segments or the virtual address is \
-		different from the physical address.
+		.. note:: This method **may** be overridden by custom BinaryViews. If not overridden, removing data is disallowed
 		.. warning:: This method **must not** be called directly.
 
 		:param int addr: a virtual address
@@ -1665,14 +1774,14 @@ class BinaryView(object):
 		:return: length of data removed, should return 0 on error
 		:rtype: int
 		"""
-		raise NotImplementedError
+		return 0
 
-	@abc.abstractmethod
 	def perform_get_modification(self, addr):
 		"""
 		``perform_get_modification`` implements query to the whether the virtual address ``addr`` is modified.
 
-		.. note:: This method **may** be overridden by custom BinaryViews.
+		.. note:: This method **may** be overridden by custom BinaryViews. Use ``add_auto_segment`` to provide
+		data without overriding this method.
 		.. warning:: This method **must not** be called directly.
 
 		:param int addr: a virtual address to be checked
@@ -1681,13 +1790,12 @@ class BinaryView(object):
 		"""
 		return core.Original
 
-	@abc.abstractmethod
 	def perform_is_valid_offset(self, addr):
 		"""
 		``perform_is_valid_offset`` implements a check if an virtual address ``addr`` is valid.
 
-		.. note:: This method **must** be implemented for custom BinaryViews whose virtual addresses differ from \
-		physical file offsets.
+		.. note:: This method **may** be overridden by custom BinaryViews. Use ``add_auto_segment`` to provide
+		data without overriding this method.
 		.. warning:: This method **must not** be called directly.
 
 		:param int addr: a virtual address to be checked
@@ -1697,13 +1805,12 @@ class BinaryView(object):
 		data = self.read(addr, 1)
 		return (data is not None) and (len(data) == 1)
 
-	@abc.abstractmethod
 	def perform_is_offset_readable(self, offset):
 		"""
 		``perform_is_offset_readable`` implements a check if an virtual address is readable.
 
-		.. note:: This method **must** be implemented for custom BinaryViews whose virtual addresses differ from \
-		physical file offsets, or if memory protections exist.
+		.. note:: This method **may** be overridden by custom BinaryViews. Use ``add_auto_segment`` to provide
+		data without overriding this method.
 		.. warning:: This method **must not** be called directly.
 
 		:param int offset: a virtual address to be checked
@@ -1712,13 +1819,12 @@ class BinaryView(object):
 		"""
 		return self.is_valid_offset(offset)
 
-	@abc.abstractmethod
 	def perform_is_offset_writable(self, addr):
 		"""
 		``perform_is_offset_writable`` implements a check if a virtual address ``addr`` is writable.
 
-		.. note:: This method **must** be implemented for custom BinaryViews whose virtual addresses differ from \
-		physical file offsets, or if memory protections exist.
+		.. note:: This method **may** be overridden by custom BinaryViews. Use ``add_auto_segment`` to provide
+		data without overriding this method.
 		.. warning:: This method **must not** be called directly.
 
 		:param int addr: a virtual address to be checked
@@ -1727,13 +1833,12 @@ class BinaryView(object):
 		"""
 		return self.is_valid_offset(addr)
 
-	@abc.abstractmethod
 	def perform_is_offset_executable(self, addr):
 		"""
 		``perform_is_offset_writable`` implements a check if a virtual address ``addr`` is executable.
 
-		.. note:: This method **must** be implemented for custom BinaryViews whose virtual addresses differ from \
-		physical file offsets, or if memory protections exist.
+		.. note:: This method **may** be overridden by custom BinaryViews. Use ``add_auto_segment`` to provide
+		data without overriding this method.
 		.. warning:: This method **must not** be called directly.
 
 		:param int addr: a virtual address to be checked
@@ -1742,13 +1847,13 @@ class BinaryView(object):
 		"""
 		return self.is_valid_offset(addr)
 
-	@abc.abstractmethod
 	def perform_get_next_valid_offset(self, addr):
 		"""
 		``perform_get_next_valid_offset`` implements a query for the next valid readable, writable, or executable virtual
 		memory address.
 
-		.. note:: This method **may** be implemented by custom BinaryViews
+		.. note:: This method **may** be overridden by custom BinaryViews. Use ``add_auto_segment`` to provide
+		data without overriding this method.
 		.. warning:: This method **must not** be called directly.
 
 		:param int addr: a virtual address to start checking from.
@@ -1759,13 +1864,13 @@ class BinaryView(object):
 			return self.perform_get_start()
 		return addr
 
-	@abc.abstractmethod
 	def perform_get_start(self):
 		"""
 		``perform_get_start`` implements a query for the first readable, writable, or executable virtual address in
 		the BinaryView.
 
-		.. note:: This method **may** be implemented by custom BinaryViews
+		.. note:: This method **may** be overridden by custom BinaryViews. Use ``add_auto_segment`` to provide
+		data without overriding this method.
 		.. warning:: This method **must not** be called directly.
 
 		:return: returns the first virtual address in the BinaryView.
@@ -1773,7 +1878,6 @@ class BinaryView(object):
 		"""
 		return 0
 
-	@abc.abstractmethod
 	def perform_get_entry_point(self):
 		"""
 		``perform_get_entry_point`` implements a query for the initial entry point for code execution.
@@ -1786,7 +1890,6 @@ class BinaryView(object):
 		"""
 		return 0
 
-	@abc.abstractmethod
 	def perform_is_executable(self):
 		"""
 		``perform_is_executable`` implements a check which returns true if the BinaryView is executable.
@@ -1797,9 +1900,8 @@ class BinaryView(object):
 		:return: true if the current BinaryView is executable, false if it is not executable or on error
 		:rtype: bool
 		"""
-		raise NotImplementedError
+		return False
 
-	@abc.abstractmethod
 	def perform_get_default_endianness(self):
 		"""
 		``perform_get_default_endianness`` implements a check which returns true if the BinaryView is executable.
@@ -2868,7 +2970,7 @@ class BinaryView(object):
 		result = []
 		for i in xrange(0, count.value):
 			result.append(StringReference(core.BNStringType_names[strings[i].type], strings[i].start, strings[i].length))
-		core.BNFreeStringList(strings)
+		core.BNFreeStringReferenceList(strings)
 		return result
 
 	def add_analysis_completion_event(self, callback):
@@ -3387,6 +3489,73 @@ class BinaryView(object):
 			return None
 		return value.value
 
+	def add_auto_segment(self, start, length, data_offset, data_length, flags):
+		core.BNAddAutoSegment(self.handle, start, length, data_offset, data_length, flags)
+
+	def remove_auto_segment(self, start, length):
+		core.BNRemoveAutoSegment(self.handle, start, length)
+
+	def add_user_segment(self, start, length, data_offset, data_length, flags):
+		core.BNAddUserSegment(self.handle, start, length, data_offset, data_length, flags)
+
+	def remove_user_segment(self, start, length):
+		core.BNRemoveUserSegment(self.handle, start, length)
+
+	def get_segment_at(self, addr):
+		segment = core.BNSegment()
+		if not core.BNGetSegmentAt(self.handle, addr, segment):
+			return None
+		result = Segment(segment.start, segment.length, segment.dataOffset, segment.dataLength,
+			segment.flags)
+		return result
+
+	def add_auto_section(self, name, start, length, type = "", align = 1, entry_size = 1, linked_section = "",
+		info_section = "", info_data = 0):
+		core.BNAddAutoSection(self.handle, name, start, length, type, align, entry_size, linked_section,
+			info_section, info_data)
+
+	def remove_auto_section(self, name):
+		core.BNRemoveAutoSection(self.handle, name)
+
+	def add_user_section(self, name, start, length, type = "", align = 1, entry_size = 1, linked_section = "",
+		info_section = "", info_data = 0):
+		core.BNAddUserSection(self.handle, name, start, length, type, align, entry_size, linked_section,
+			info_section, info_data)
+
+	def remove_user_section(self, name):
+		core.BNRemoveUserSection(self.handle, name)
+
+	def get_sections_at(self, addr):
+		count = ctypes.c_ulonglong(0)
+		section_list = core.BNGetSectionsAt(self.handle, addr, count)
+		result = []
+		for i in xrange(0, count.value):
+			result.append(Section(section_list[i].name, section_list[i].type, section_list[i].start,
+				section_list[i].length, section_list[i].linkedSection, section_list[i].infoSection,
+				section_list[i].infoData, section_list[i].align, section_list[i].entrySize))
+		core.BNFreeSectionList(section_list, count.value)
+		return result
+
+	def get_section_by_name(self, name):
+		section = core.BNSection()
+		if not core.BNGetSectionByName(self.handle, name, section):
+			return None
+		result = Section(section.name, section.type, section.start, section.length, section.linkedSection,
+			section.infoSection, section.infoData, section.align, section.entrySize)
+		core.BNFreeSection(section)
+		return result
+
+	def get_unique_section_names(self, name_list):
+		incoming_names = (ctypes.c_char_p * len(name_list))()
+		for i in xrange(0, len(name_list)):
+			incoming_names[i] = name_list[i]
+		outgoing_names = core.BNGetUniqueSectionNames(self.handle, incoming_names, len(name_list))
+		result = []
+		for i in xrange(0, len(name_list)):
+			result.append(str(outgoing_names[i]))
+		core.BNFreeStringList(outgoing_names, len(name_list))
+		return result
+
 	def __setattr__(self, name, value):
 		try:
 			object.__setattr__(self,name,value)
@@ -5270,7 +5439,7 @@ class FunctionGraphBlock(object):
 			core.BNFreeBasicBlock(block)
 			block = None
 		else:
-			block = BasicBlock(BinaryView(None, handle = core.BNGetFunctionData(func)), block)
+			block = BasicBlock(BinaryView(handle = core.BNGetFunctionData(func)), block)
 			core.BNFreeFunction(func)
 		return block
 
@@ -8723,7 +8892,7 @@ class FunctionRecognizer(object):
 	def _recognize_low_level_il(self, ctxt, data, func, il):
 		try:
 			file_metadata = FileMetadata(handle = core.BNGetFileForView(data))
-			view = BinaryView(file_metadata, handle = core.BNNewViewReference(data))
+			view = BinaryView(file_metadata = file_metadata, handle = core.BNNewViewReference(data))
 			func = Function(view, handle = core.BNNewFunctionReference(func))
 			il = LowLevelILFunction(func.arch, handle = core.BNNewLowLevelILFunctionReference(il))
 			return self.recognize_low_level_il(view, func, il)
@@ -8960,7 +9129,7 @@ class PluginCommand:
 	def _default_action(cls, view, action):
 		try:
 			file_metadata = FileMetadata(handle = core.BNGetFileForView(view))
-			view_obj = BinaryView(file_metadata, handle = core.BNNewViewReference(view))
+			view_obj = BinaryView(file_metadata = file_metadata, handle = core.BNNewViewReference(view))
 			action(view_obj)
 		except:
 			log_error(traceback.format_exc())
@@ -8969,7 +9138,7 @@ class PluginCommand:
 	def _address_action(cls, view, addr, action):
 		try:
 			file_metadata = FileMetadata(handle = core.BNGetFileForView(view))
-			view_obj = BinaryView(file_metadata, handle = core.BNNewViewReference(view))
+			view_obj = BinaryView(file_metadata = file_metadata, handle = core.BNNewViewReference(view))
 			action(view_obj, addr)
 		except:
 			log_error(traceback.format_exc())
@@ -8978,7 +9147,7 @@ class PluginCommand:
 	def _range_action(cls, view, addr, length, action):
 		try:
 			file_metadata = FileMetadata(handle = core.BNGetFileForView(view))
-			view_obj = BinaryView(file_metadata, handle = core.BNNewViewReference(view))
+			view_obj = BinaryView(file_metadata = file_metadata, handle = core.BNNewViewReference(view))
 			action(view_obj, addr, length)
 		except:
 			log_error(traceback.format_exc())
@@ -8987,7 +9156,7 @@ class PluginCommand:
 	def _function_action(cls, view, func, action):
 		try:
 			file_metadata = FileMetadata(handle = core.BNGetFileForView(view))
-			view_obj = BinaryView(file_metadata, handle = core.BNNewViewReference(view))
+			view_obj = BinaryView(file_metadata = file_metadata, handle = core.BNNewViewReference(view))
 			func_obj = Function(view_obj, core.BNNewFunctionReference(func))
 			action(view_obj, func_obj)
 		except:
@@ -8999,7 +9168,7 @@ class PluginCommand:
 			if is_valid is None:
 				return True
 			file_metadata = FileMetadata(handle = core.BNGetFileForView(view))
-			view_obj = BinaryView(file_metadata, handle = core.BNNewViewReference(view))
+			view_obj = BinaryView(file_metadata = file_metadata, handle = core.BNNewViewReference(view))
 			return is_valid(view_obj)
 		except:
 			log_error(traceback.format_exc())
@@ -9011,7 +9180,7 @@ class PluginCommand:
 			if is_valid is None:
 				return True
 			file_metadata = FileMetadata(handle = core.BNGetFileForView(view))
-			view_obj = BinaryView(file_metadata, handle = core.BNNewViewReference(view))
+			view_obj = BinaryView(file_metadata = file_metadata, handle = core.BNNewViewReference(view))
 			return is_valid(view_obj, addr)
 		except:
 			log_error(traceback.format_exc())
@@ -9023,7 +9192,7 @@ class PluginCommand:
 			if is_valid is None:
 				return True
 			file_metadata = FileMetadata(handle = core.BNGetFileForView(view))
-			view_obj = BinaryView(file_metadata, handle = core.BNNewViewReference(view))
+			view_obj = BinaryView(file_metadata = file_metadata, handle = core.BNNewViewReference(view))
 			return is_valid(view_obj, addr, length)
 		except:
 			log_error(traceback.format_exc())
@@ -9035,7 +9204,7 @@ class PluginCommand:
 			if is_valid is None:
 				return True
 			file_metadata = FileMetadata(handle = core.BNGetFileForView(view))
-			view_obj = BinaryView(file_metadata, handle = core.BNNewViewReference(view))
+			view_obj = BinaryView(file_metadata = file_metadata, handle = core.BNNewViewReference(view))
 			func_obj = Function(view_obj, core.BNNewFunctionReference(func))
 			return is_valid(view_obj, func_obj)
 		except:
@@ -9599,7 +9768,7 @@ class ScriptingInstance(object):
 	def _set_current_binary_view(self, ctxt, view):
 		try:
 			if view:
-				view = BinaryView(None, handle = core.BNNewViewReference(view))
+				view = BinaryView(handle = core.BNNewViewReference(view))
 			else:
 				view = None
 			self.perform_set_current_binary_view(view)
@@ -9609,7 +9778,7 @@ class ScriptingInstance(object):
 	def _set_current_function(self, ctxt, func):
 		try:
 			if func:
-				func = Function(BinaryView(None, handle = core.BNGetFunctionData(func)), core.BNNewFunctionReference(func))
+				func = Function(BinaryView(handle = core.BNGetFunctionData(func)), core.BNNewFunctionReference(func))
 			else:
 				func = None
 			self.perform_set_current_function(func)
@@ -9623,7 +9792,7 @@ class ScriptingInstance(object):
 				if func is None:
 					block = None
 				else:
-					block = BasicBlock(BinaryView(None, handle = core.BNGetFunctionData(func)), core.BNNewBasicBlockReference(block))
+					block = BasicBlock(BinaryView(handle = core.BNGetFunctionData(func)), core.BNNewBasicBlockReference(block))
 					core.BNFreeFunction(func)
 			else:
 				block = None
@@ -10373,7 +10542,7 @@ class InteractionHandler(object):
 	def _show_plain_text_report(self, ctxt, view, title, contents):
 		try:
 			if view:
-				view = BinaryView(None, handle = core.BNNewViewReference(view))
+				view = BinaryView(handle = core.BNNewViewReference(view))
 			else:
 				view = None
 			self.show_plain_text_report(view, title, contents)
@@ -10383,7 +10552,7 @@ class InteractionHandler(object):
 	def _show_markdown_report(self, ctxt, view, title, contents, plaintext):
 		try:
 			if view:
-				view = BinaryView(None, handle = core.BNNewViewReference(view))
+				view = BinaryView(handle = core.BNNewViewReference(view))
 			else:
 				view = None
 			self.show_markdown_report(view, title, contents, plaintext)
@@ -10393,7 +10562,7 @@ class InteractionHandler(object):
 	def _show_html_report(self, ctxt, view, title, contents, plaintext):
 		try:
 			if view:
-				view = BinaryView(None, handle = core.BNNewViewReference(view))
+				view = BinaryView(handle = core.BNNewViewReference(view))
 			else:
 				view = None
 			self.show_html_report(view, title, contents, plaintext)
@@ -10423,7 +10592,7 @@ class InteractionHandler(object):
 	def _get_address_input(self, ctxt, result, prompt, title, view, current_address):
 		try:
 			if view:
-				view = BinaryView(None, handle = core.BNNewViewReference(view))
+				view = BinaryView(handle = core.BNNewViewReference(view))
 			else:
 				view = None
 			value = self.get_address_input(prompt, title, view, current_address)
@@ -10494,7 +10663,7 @@ class InteractionHandler(object):
 				elif fields[i].type == core.AddressFormField:
 					view = None
 					if fields[i].view:
-						view = BinaryView(None, handle = core.BNNewViewReference(fields[i].view))
+						view = BinaryView(handle = core.BNNewViewReference(fields[i].view))
 					field_objs.append(AddressField(fields[i].prompt, view, fields[i].currentAddress))
 				elif fields[i].type == core.ChoiceFormField:
 					choices = []