diff options
| author | Michael Krasnitski <michael.krasnitski@gmail.com> | 2024-04-16 19:32:04 -0400 |
|---|---|---|
| committer | Kyle Martin <krm504@nyu.edu> | 2024-05-09 13:11:41 -0400 |
| commit | 29b62677dad48aa4d55ad2dae5d176d9880216bd (patch) | |
| tree | f205a5f4ebb7e71ea132fe06a7076c70616d3c62 /rust/examples/minidump/src | |
| parent | 608f261e6bca5869e748d4509da92a5717dce75d (diff) | |
Fix clippy warnings and run rustfmt
Diffstat (limited to 'rust/examples/minidump/src')
| -rw-r--r-- | rust/examples/minidump/src/command.rs | 5 | ||||
| -rw-r--r-- | rust/examples/minidump/src/view.rs | 32 |
2 files changed, 3 insertions, 34 deletions
diff --git a/rust/examples/minidump/src/command.rs b/rust/examples/minidump/src/command.rs index 0b10c65a..d33a8d0b 100644 --- a/rust/examples/minidump/src/command.rs +++ b/rust/examples/minidump/src/command.rs @@ -5,14 +5,11 @@ use minidump::{Minidump, MinidumpMemoryInfoList}; use binaryninja::binaryview::{BinaryView, BinaryViewBase, BinaryViewExt}; -use crate::view::DataBufferWrapper; - pub fn print_memory_information(bv: &BinaryView) { debug!("Printing memory information"); if let Ok(minidump_bv) = bv.parent_view() { if let Ok(read_buffer) = minidump_bv.read_buffer(0, minidump_bv.len()) { - let read_buffer = DataBufferWrapper::new(read_buffer); - if let Ok(minidump_obj) = Minidump::read(read_buffer) { + if let Ok(minidump_obj) = Minidump::read(read_buffer.get_data()) { if let Ok(memory_info_list) = minidump_obj.get_stream::<MinidumpMemoryInfoList>() { let mut memory_info_list_writer = Vec::new(); match memory_info_list.print(&mut memory_info_list_writer) { diff --git a/rust/examples/minidump/src/view.rs b/rust/examples/minidump/src/view.rs index 9eee6aa6..bbbe0bd5 100644 --- a/rust/examples/minidump/src/view.rs +++ b/rust/examples/minidump/src/view.rs @@ -1,6 +1,5 @@ use std::collections::HashMap; -use std::ops::{Deref, Range}; -use std::sync::Arc; +use std::ops::Range; use binaryninja::section::Section; use binaryninja::segment::Segment; @@ -16,37 +15,11 @@ use binaryninja::custombinaryview::{ BinaryViewType, BinaryViewTypeBase, CustomBinaryView, CustomBinaryViewType, CustomView, CustomViewBuilder, }; -use binaryninja::databuffer::DataBuffer; use binaryninja::platform::Platform; use binaryninja::Endianness; type BinaryViewResult<R> = binaryninja::binaryview::Result<R>; -/// A wrapper around a `binaryninja::databuffer::DataBuffer`, from which a `[u8]` buffer can be obtained -/// to pass to `minidump::Minidump::read`. -/// -/// This code is taken from [`dwarfdump`](https://github.com/Vector35/binaryninja-api/blob/9d8bc846bd213407fb1a7a19af2a96f17501ac3b/rust/examples/dwarfdump/src/lib.rs#L81) -/// in the Rust API examples. -#[derive(Clone)] -pub struct DataBufferWrapper { - inner: Arc<DataBuffer>, -} - -impl DataBufferWrapper { - pub fn new(buf: DataBuffer) -> Self { - DataBufferWrapper { - inner: Arc::new(buf), - } - } -} - -impl Deref for DataBufferWrapper { - type Target = [u8]; - fn deref(&self) -> &Self::Target { - self.inner.get_data() - } -} - /// The _Minidump_ binary view type, which the Rust plugin registers with the Binary Ninja core /// (via `binaryninja::custombinaryview::register_view_type`) as a possible binary view /// that can be applied to opened binaries. @@ -141,9 +114,8 @@ impl MinidumpBinaryView { fn init(&self) -> BinaryViewResult<()> { let parent_view = self.parent_view()?; let read_buffer = parent_view.read_buffer(0, parent_view.len())?; - let read_buffer = DataBufferWrapper::new(read_buffer); - if let Ok(minidump_obj) = Minidump::read(read_buffer) { + if let Ok(minidump_obj) = Minidump::read(read_buffer.get_data()) { // Architecture, platform information if let Ok(minidump_system_info) = minidump_obj.get_stream::<MinidumpSystemInfo>() { if let Some(platform) = MinidumpBinaryView::translate_minidump_platform( |
