yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed context

Browse Source
This commit is contained in:
Dominik Maier
2021-11-09 16:19:27 +01:00
parent 3b0ce89a7a
commit 492779d7d4
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/rust/src/ffi.rs
View File

@ -9,7 +9,7 @@ use std::{ffi::c_void, marker::PhantomData};
pub type uc_handle = *mut c_void; pub type uc_handle = *mut c_void;
pub type uc_hook = *mut c_void; pub type uc_hook = *mut c_void;
pub type uc_context = libc::size_t; pub type uc_context = *mut c_void;
extern "C" { extern "C" {
pub fn uc_version(major: *mut u32, minor: *mut u32) -> u32; pub fn uc_version(major: *mut u32, minor: *mut u32) -> u32;

21
bindings/rust/src/lib.rs
View File

@ -35,11 +35,12 @@ mod arm64;
mod m68k; mod m68k;
mod mips; mod mips;
mod ppc; mod ppc;
mod riscv;
mod sparc; mod sparc;
mod x86; mod x86;
use std::{marker::PhantomData, ptr}; use std::{marker::PhantomData, ptr};
pub use crate::{arm::*, arm64::*, m68k::*, mips::*, ppc::*, sparc::*, x86::*}; pub use crate::{arm::*, arm64::*, m68k::*, mips::*, ppc::*, riscv::*, sparc::*, x86::*};
use ffi::uc_handle; use ffi::uc_handle;
use libc::c_void; use libc::c_void;
@ -51,19 +52,9 @@ pub struct Context {
} }
impl Context { impl Context {
#[must_use]
pub fn new() -> Self {
Context { context: 0 }
}
#[must_use] #[must_use]
pub fn is_initialized(&self) -> bool { pub fn is_initialized(&self) -> bool {
self.context != 0 !self.context.is_null()
}
}
impl Default for Context {
fn default() -> Self {
Self::new()
} }
} }
@ -74,7 +65,7 @@ impl Drop for Context {
ffi::uc_context_free(self.context); ffi::uc_context_free(self.context);
} }
} }
self.context = 0; self.context = ptr::null_mut();
} }
} }
@ -642,7 +633,7 @@ impl<'a, D> Unicorn<'a, D> {
/// ///
/// To be populated via `context_save`. /// To be populated via `context_save`.
pub fn context_alloc(&self) -> Result<Context, uc_error> { pub fn context_alloc(&self) -> Result<Context, uc_error> {
let mut empty_context: ffi::uc_context = Default::default(); let mut empty_context: ffi::uc_context = ptr::null_mut();
let err = unsafe { ffi::uc_context_alloc(self.uc, &mut empty_context) }; let err = unsafe { ffi::uc_context_alloc(self.uc, &mut empty_context) };
if err == uc_error::OK { if err == uc_error::OK {
Ok(Context { Ok(Context {
@ -669,7 +660,7 @@ impl<'a, D> Unicorn<'a, D> {
/// In case of many non-concurrent context saves, use `context_alloc` and *_save /// In case of many non-concurrent context saves, use `context_alloc` and *_save
/// individually to avoid unnecessary allocations. /// individually to avoid unnecessary allocations.
pub fn context_init(&self) -> Result<Context, uc_error> { pub fn context_init(&self) -> Result<Context, uc_error> {
let mut new_context: ffi::uc_context = Default::default(); let mut new_context: ffi::uc_context = ptr::null_mut();
let err = unsafe { ffi::uc_context_alloc(self.uc, &mut new_context) }; let err = unsafe { ffi::uc_context_alloc(self.uc, &mut new_context) };
if err != uc_error::OK { if err != uc_error::OK {
return Err(err); return Err(err);