milksad
/
rust-secp256k1-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

implemented strlen to deref the callback message

This commit is contained in:
Elichai Turkel 2019-06-13 13:22:46 -04:00
parent 8022757681
commit 68c5c5edbf
No known key found for this signature in database
GPG Key ID: 9383CDE9E8E66A7F
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/ffi.rs
View File

@ -275,9 +275,11 @@ extern "C" {
/// ///
/// See also secp256k1_default_error_callback_fn. /// See also secp256k1_default_error_callback_fn.
/// ///
pub extern "C" fn secp256k1_default_illegal_callback_fn(_message: *const c_char, _data: *mut c_void) { pub unsafe extern "C" fn secp256k1_default_illegal_callback_fn(message: *const c_char, _data: *mut c_void) {
// Do we need to deref the message and print it? if so without std we'll need to use `strlen` use core::{str, slice};
panic!("[libsecp256k1] illegal argument."); let msg_slice = slice::from_raw_parts(message as *const u8, strlen(message));
let msg = str::from_utf8_unchecked(msg_slice);
panic!("[libsecp256k1] illegal argument. {}", msg);
} }
#[no_mangle] #[no_mangle]
@ -295,9 +297,21 @@ pub extern "C" fn secp256k1_default_illegal_callback_fn(_message: *const c_char,
/// ///
/// See also secp256k1_default_illegal_callback_fn. /// See also secp256k1_default_illegal_callback_fn.
/// ///
pub extern "C" fn secp256k1_default_error_callback_fn(_message: *const c_char, _data: *mut c_void) { pub unsafe extern "C" fn secp256k1_default_error_callback_fn(message: *const c_char, _data: *mut c_void) {
// Do we need to deref the message and print it? if so without std we'll need to use `strlen` use core::{str, slice};
panic!("[libsecp256k1] internal consistency check failed."); let msg_slice = slice::from_raw_parts(message as *const u8, strlen(message));
let msg = str::from_utf8_unchecked(msg_slice);
panic!("[libsecp256k1] internal consistency check failed {}", msg);
}
unsafe fn strlen(mut str_ptr: *const c_char) -> usize {
let mut ctr = 0;
while *str_ptr != '\0' as c_char {
ctr += 1;
str_ptr = str_ptr.offset(1);
}
ctr
} }
@ -648,3 +662,18 @@ mod fuzz_dummy {
} }
#[cfg(feature = "fuzztarget")] #[cfg(feature = "fuzztarget")]
pub use self::fuzz_dummy::*; pub use self::fuzz_dummy::*;
#[cfg(test)]
mod tests {
use std::ffi::CString;
use super::strlen;
#[test]
fn test_strlen() {
let orig = "test strlen \t \n";
let test = CString::new(orig).unwrap();
assert_eq!(orig.len(), unsafe {strlen(test.as_ptr())});
}
}