Update error handling for IL getters API change

Newer version Binja return None on Function.mlil if the IL fails to
load, while older versions raise ILException. This change ensures we
support both

Author: zznop

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023-2024 Vector 35 Inc.
+Copyright 2023-2025 Vector 35 Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -1,4 +1,4 @@
-# EFI Resolver (v1.2.0)
+# EFI Resolver (v1.3.0)
 Author: **Vector 35 Inc**
 
 _A Binary Ninja plugin that automatically resolves type information for EFI protocol usage._

plugin.json

@@ -11,7 +11,7 @@
     "longdescription": "EFI Resolver is a Binary Ninja plugin that automates the task of resolving EFI protocol type information, which supports both DXE drivers and PEI modules. It propagates EFI related pointers from entry point to where they are stored, (e.g. system table, MM system table, boot services, and runtime services). For PEI files, it also support identifies processor-specific PEI service pointers. The plugin also identifies references to the boot services, PEI services and MM protocol functions and applies type information according to the GUID passed to these functions. The plugin supports the core UEFI specification by default, and allows users to provide custom GUIDs and protocols.",
     "license": {
         "name": "Apache-2.0",
-        "text": "Copyright 2023-2024 Vector 35 Inc.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License."
+        "text": "Copyright 2023-2025 Vector 35 Inc.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License."
     },
     "platforms": [
         "Darwin",
@@ -24,7 +24,7 @@
         "Windows": "no special instructions, package manager is recommended"
     },
     "dependencies": {},
-    "version": "1.2.0",
+    "version": "1.3.0",
     "author": "Vector 35 Inc",
     "minimumbinaryninjaversion": 4333
 }

ppi.py

@@ -123,8 +123,11 @@ def define_pei_idt(bv: BinaryView, task: BackgroundTask) -> bool:
     # TODO there is a type propagation issue (vector35/binaryninja#759) related to indirect struct access in core,
     #  manually fix it now, the following should be removed after the bug is fixed.
     for ref in bv.get_code_refs_for_type("EFI_PEI_SERVICES"):
+        # This pattern accounts for an API change in ref.mlil and ensures the plugin works with all versions of Binja
+        # See https://github.com/Vector35/binaryninja-api/issues/6020 for more details
         try:
             instr = ref.mlil
+            if instr is None: raise ILException()
         except ILException:
             log_warn(f"mlil not available at {hex(ref.address)}")
             continue
@@ -205,8 +208,10 @@ def define_pei_descriptor(bv: BinaryView, task: BackgroundTask) -> bool:
         for ref in refs:
             if task.cancelled:
                 return False
+
             try:
                 instr = ref.mlil
+                if instr is None: raise ILException()
             except ILException:
                 log_warn(f"mlil unavailable for ref: {hex(ref.address)}")
                 continue