Rewrite metadata::get_item without unsafe
This commit is contained in:
+12
-23
@@ -31,49 +31,38 @@
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
use crate::{consts::*, error::Error, serialization::*, transaction::Transaction, Buffer};
|
||||
use std::{ptr, slice};
|
||||
use std::ptr;
|
||||
use zeroize::Zeroizing;
|
||||
|
||||
/// Get metadata item
|
||||
pub(crate) fn get_item(data: &[u8], tag: u8) -> Result<&[u8], Error> {
|
||||
let mut p_temp: *const u8 = data.as_ptr();
|
||||
let mut cb_temp: usize = 0;
|
||||
let mut tag_temp: u8;
|
||||
let mut offset = 0;
|
||||
|
||||
unsafe {
|
||||
while p_temp < data.as_ptr().add(data.len()) {
|
||||
tag_temp = *p_temp;
|
||||
p_temp = p_temp.add(1);
|
||||
while offset < data.len() {
|
||||
let tag_temp = data[offset];
|
||||
offset += 1;
|
||||
|
||||
let p_slice = slice::from_raw_parts(
|
||||
p_temp,
|
||||
data.as_ptr() as usize + data.len() - p_temp as usize,
|
||||
);
|
||||
|
||||
if !has_valid_length(
|
||||
p_slice,
|
||||
data.as_ptr().add(data.len()) as usize - p_temp as usize,
|
||||
) {
|
||||
if !has_valid_length(&data[offset..], data.len() - 1) {
|
||||
return Err(Error::SizeError);
|
||||
}
|
||||
|
||||
p_temp = p_temp.add(get_length(p_slice, &mut cb_temp));
|
||||
offset += get_length(&data[offset..], &mut cb_temp);
|
||||
|
||||
if tag_temp == tag {
|
||||
// found tag
|
||||
break;
|
||||
}
|
||||
|
||||
p_temp = p_temp.add(cb_temp);
|
||||
}
|
||||
|
||||
if p_temp < data.as_ptr().add(data.len()) {
|
||||
return Ok(slice::from_raw_parts(p_temp, cb_temp));
|
||||
}
|
||||
offset += cb_temp;
|
||||
}
|
||||
|
||||
if offset < data.len() {
|
||||
Ok(&data[offset..offset + cb_temp])
|
||||
} else {
|
||||
Err(Error::GenericError)
|
||||
}
|
||||
}
|
||||
|
||||
/// Set metadata item
|
||||
pub(crate) fn set_item(
|
||||
|
||||
Reference in New Issue
Block a user