Skip to content

[Rust] Fix UB for basic block analysis context out params #7908

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

Merged
emesare merged 1 commit into from
Jan 20, 2026
+34 −16
Merged

[Rust] Fix UB for basic block analysis context out params #7908

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
50 changes: 34 additions & 16 deletions rust/src/architecture/basic_block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,40 +71,58 @@ impl BasicBlockAnalysisContext {
.zip(raw_contextual_return_vals.iter().copied())
.collect();

let raw_direct_ref_sources: &[BNArchitectureAndAddress] =
unsafe { std::slice::from_raw_parts(ctx_ref.directRefSources, ctx_ref.directRefCount) };
let raw_direct_ref_targets: &[u64] =
unsafe { std::slice::from_raw_parts(ctx_ref.directRefTargets, ctx_ref.directRefCount) };
// The lists below this are out params and are possibly not initialized.
let raw_direct_ref_sources: &[BNArchitectureAndAddress] = match ctx_ref
.directRefSources
.is_null()
{
true => &[],
false => std::slice::from_raw_parts(ctx_ref.directRefSources, ctx_ref.directRefCount),
};
let raw_direct_ref_targets: &[u64] = match ctx_ref.directRefTargets.is_null() {
true => &[],
false => std::slice::from_raw_parts(ctx_ref.directRefTargets, ctx_ref.directRefCount),
};
let direct_code_references: HashMap<u64, Location> = raw_direct_ref_targets
.iter()
.copied()
.zip(raw_direct_ref_sources.iter().map(Location::from))
.collect();

let raw_direct_no_return_calls: &[BNArchitectureAndAddress] = std::slice::from_raw_parts(
ctx_ref.directNoReturnCalls,
ctx_ref.directNoReturnCallsCount,
);
let raw_direct_no_return_calls: &[BNArchitectureAndAddress] =
match ctx_ref.directNoReturnCalls.is_null() {
true => &[],
false => std::slice::from_raw_parts(
ctx_ref.directNoReturnCalls,
ctx_ref.directNoReturnCallsCount,
),
};
let direct_no_return_calls: HashSet<Location> = raw_direct_no_return_calls
.iter()
.map(Location::from)
.collect();

let raw_halted_disassembly_address: &[BNArchitectureAndAddress] =
std::slice::from_raw_parts(
ctx_ref.haltedDisassemblyAddresses,
ctx_ref.haltedDisassemblyAddressesCount,
);
match ctx_ref.haltedDisassemblyAddresses.is_null() {
true => &[],
false => std::slice::from_raw_parts(
ctx_ref.haltedDisassemblyAddresses,
ctx_ref.haltedDisassemblyAddressesCount,
),
};
let halted_disassembly_addresses: HashSet<Location> = raw_halted_disassembly_address
.iter()
.map(Location::from)
.collect();

let raw_inlined_unresolved_indirect_branches: &[BNArchitectureAndAddress] =
std::slice::from_raw_parts(
ctx_ref.inlinedUnresolvedIndirectBranches,
ctx_ref.inlinedUnresolvedIndirectBranchCount,
);
match ctx_ref.inlinedUnresolvedIndirectBranches.is_null() {
true => &[],
false => std::slice::from_raw_parts(
ctx_ref.inlinedUnresolvedIndirectBranches,
ctx_ref.inlinedUnresolvedIndirectBranchCount,
),
};
let inlined_unresolved_indirect_branches: HashSet<Location> =
raw_inlined_unresolved_indirect_branches
.iter()
Expand Down
Loading