Skip to content

fix rust TagReference with null Architecture or Function #7899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rbran wants to merge 1 commit into
base: dev
Choose a base branch
from
+7 −4
Open

fix rust TagReference with null Architecture or Function #7899

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions rust/src/tags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

use binaryninjacore_sys::*;
use std::fmt::{Debug, Formatter};
use std::ptr::NonNull;

use crate::architecture::CoreArchitecture;
use crate::binary_view::BinaryView;
Expand Down Expand Up @@ -257,8 +258,8 @@ unsafe impl Sync for TagType {}

#[derive(Clone, PartialEq)]
pub struct TagReference {
pub arch: CoreArchitecture,
pub func: Ref<Function>,
pub arch: Option<CoreArchitecture>,
pub func: Option<Ref<Function>>,
pub addr: u64,
pub auto_defined: bool,
pub reference_type: TagReferenceType,
Expand All @@ -271,8 +272,10 @@ impl From<&BNTagReference> for TagReference {
reference_type: value.refType,
auto_defined: value.autoDefined,
tag: unsafe { Tag::from_raw(value.tag).to_owned() },
arch: unsafe { CoreArchitecture::from_raw(value.arch) },
func: unsafe { Function::from_raw(value.func).to_owned() },
arch: NonNull::new(value.arch)
.map(|arch| unsafe { CoreArchitecture::from_raw(arch.as_ptr()) }),
func: NonNull::new(value.func)
.map(|func| unsafe { Function::from_raw(func.as_ptr()).to_owned() }),
addr: value.addr,
}
}
Expand Down
Loading