Try to load eh_frame/debug_frame from both raw and normal views in dwarf import

Author: negasora

plugins/dwarf/dwarf_import/src/lib.rs

@@ -44,6 +44,7 @@ use gimli::{
 
 use binaryninja::logger::Logger;
 use helpers::{get_build_id, load_debug_info_for_build_id};
+use iset::IntervalMap;
 use log::{debug, error, warn};
 
 trait ReaderType: Reader<Offset = usize> {}
@@ -512,6 +513,42 @@ fn get_supplementary_build_id(bv: &BinaryView) -> Option<String> {
     }
 }
 
+fn parse_range_data_offsets(bv: &BinaryView, dwo_file: bool) -> Option<Result<IntervalMap<u64, i64>, ()>> {
+    if bv.section_by_name(".eh_frame").is_some() || bv.section_by_name("__eh_frame").is_some() {
+        let eh_frame_endian = get_endian(bv);
+        let eh_frame_section_reader = |section_id: SectionId| -> _ {
+            create_section_reader(section_id, bv, eh_frame_endian, dwo_file)
+        };
+        let mut eh_frame = gimli::EhFrame::load(eh_frame_section_reader).unwrap();
+        if let Some(view_arch) = bv.default_arch() {
+            if view_arch.name().as_str() == "aarch64" {
+                eh_frame.set_vendor(gimli::Vendor::AArch64);
+            }
+        }
+        eh_frame.set_address_size(bv.address_size() as u8);
+        Some(parse_unwind_section(bv, eh_frame)
+            .map_err(|e| error!("Error parsing .eh_frame: {}", e)))
+    } else if bv.section_by_name(".debug_frame").is_some()
+        || bv.section_by_name("__debug_frame").is_some()
+    {
+        let debug_frame_endian = get_endian(bv);
+        let debug_frame_section_reader = |section_id: SectionId| -> _ {
+            create_section_reader(section_id, bv, debug_frame_endian, dwo_file)
+        };
+        let mut debug_frame = gimli::DebugFrame::load(debug_frame_section_reader).unwrap();
+        if let Some(view_arch) = bv.default_arch() {
+            if view_arch.name().as_str() == "aarch64" {
+                debug_frame.set_vendor(gimli::Vendor::AArch64);
+            }
+        }
+        debug_frame.set_address_size(bv.address_size() as u8);
+        Some(parse_unwind_section(bv, debug_frame)
+            .map_err(|e| error!("Error parsing .debug_frame: {}", e)))
+    } else {
+        None
+    }
+}
+
 fn parse_dwarf(
     bv: &BinaryView,
     debug_bv: &BinaryView,
@@ -563,40 +600,20 @@ fn parse_dwarf(
         }
     }
 
-    let range_data_offsets;
-    if bv.section_by_name(".eh_frame").is_some() || bv.section_by_name("__eh_frame").is_some() {
-        let eh_frame_endian = get_endian(bv);
-        let eh_frame_section_reader = |section_id: SectionId| -> _ {
-            create_section_reader(section_id, bv, eh_frame_endian, dwo_file)
-        };
-        let mut eh_frame = gimli::EhFrame::load(eh_frame_section_reader).unwrap();
-        if let Some(view_arch) = bv.default_arch() {
-            if view_arch.name().as_str() == "aarch64" {
-                eh_frame.set_vendor(gimli::Vendor::AArch64);
-            }
-        }
-        eh_frame.set_address_size(bv.address_size() as u8);
-        range_data_offsets = parse_unwind_section(bv, eh_frame)
-            .map_err(|e| error!("Error parsing .eh_frame: {}", e))?;
-    } else if bv.section_by_name(".debug_frame").is_some()
-        || bv.section_by_name("__debug_frame").is_some()
-    {
-        let debug_frame_endian = get_endian(bv);
-        let debug_frame_section_reader = |section_id: SectionId| -> _ {
-            create_section_reader(section_id, bv, debug_frame_endian, dwo_file)
-        };
-        let mut debug_frame = gimli::DebugFrame::load(debug_frame_section_reader).unwrap();
-        if let Some(view_arch) = bv.default_arch() {
-            if view_arch.name().as_str() == "aarch64" {
-                debug_frame.set_vendor(gimli::Vendor::AArch64);
+    let range_data_offsets = match parse_range_data_offsets(bv, dwo_file) {
+        Some(x) => x?,
+        None => {
+            if let Some(raw_view) = bv.raw_view() {
+                if let Some(offsets) = parse_range_data_offsets(&raw_view, dwo_file) {
+                    offsets?
+                } else {
+                    Default::default()
+                }
+            } else {
+                Default::default()
             }
         }
-        debug_frame.set_address_size(bv.address_size() as u8);
-        range_data_offsets = parse_unwind_section(bv, debug_frame)
-            .map_err(|e| error!("Error parsing .debug_frame: {}", e))?;
-    } else {
-        range_data_offsets = Default::default();
-    }
+    };
 
     // Create debug info builder and recover name mapping first
     //  Since DWARF is stored as a tree with arbitrary implicit edges among leaves,