Skip to content
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

fix double-free with Array<InstructionTextToken> #5439

Closed
wants to merge 2 commits into from
Closed

fix double-free with Array<InstructionTextToken> #5439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6d7f72
fix double-free with `Array<InstructionTextToken>`
rbran May 22, 2024
5ae2db4
fix double free caused by Array<InstructionTextToken>
rbran Jun 4, 2024
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
8 changes: 4 additions & 4 deletions rust/src/disassembly.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,28 +268,28 @@ impl Drop for InstructionTextToken {
impl CoreArrayProvider for InstructionTextToken {
type Raw = BNInstructionTextToken;
type Context = ();
type Wrapped<'a> = Self;
type Wrapped<'a> = &'a Self;
}
unsafe impl CoreArrayProviderInner for InstructionTextToken {
unsafe fn free(raw: *mut Self::Raw, count: usize, _context: &Self::Context) {
BNFreeInstructionText(raw, count)
}
unsafe fn wrap_raw<'a>(raw: &'a Self::Raw, _context: &'a Self::Context) -> Self::Wrapped<'a> {
Self(*raw)
core::mem::transmute(raw)
}
}

impl CoreArrayProvider for Array<InstructionTextToken> {
type Raw = BNInstructionTextLine;
type Context = ();
type Wrapped<'a> = Self;
type Wrapped<'a> = mem::ManuallyDrop<Self>;
}
unsafe impl CoreArrayProviderInner for Array<InstructionTextToken> {
unsafe fn free(raw: *mut Self::Raw, count: usize, _context: &Self::Context) {
BNFreeInstructionTextLines(raw, count)
}
unsafe fn wrap_raw<'a>(raw: &'a Self::Raw, _context: &'a Self::Context) -> Self::Wrapped<'a> {
Self::new(raw.tokens, raw.count, ())
mem::ManuallyDrop::new(Self::new(raw.tokens, raw.count, ()))
}
}

Expand Down
Loading