mat/simdnbt
1
0
Fork 0
mirror of https://github.com/azalea-rs/simdnbt.git synced 2025-08-02 07:26:04 +00:00
Code Activity Actions

cleanup and fix ub

Browse source
This commit is contained in:
mat 2024-06-16 05:13:46 +00:00
parent 62cf6c721c
commit 024e88a78e
3 changed files with 18 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
simdnbt/src/borrow/compound.rs
View file

@ -62,70 +62,41 @@ impl<'a: 'tape, 'tape> NbtCompound<'a, 'tape> {
let (kind, _) = tag.element();
match kind {
// NbtTag::Byte(byte) => unsafe {
// unchecked_push(data, *byte as u8);
// },
TapeTagKind::Byte => unsafe {
unchecked_push(data, tag.byte().unwrap() as u8);
}, // NbtTag::Short(short) => unsafe {
// unchecked_extend(data, &short.to_be_bytes());
// },
},
TapeTagKind::Short => unsafe {
unchecked_extend(data, &tag.short().unwrap().to_be_bytes());
}, // NbtTag::Int(int) => unsafe {
// unchecked_extend(data, &int.to_be_bytes());
// },
},
TapeTagKind::Int => unsafe {
unchecked_extend(data, &tag.int().unwrap().to_be_bytes());
}, // NbtTag::Long(long) => {
// data.extend_from_slice(&long.to_be_bytes());
// }
},
TapeTagKind::Long => {
data.extend_from_slice(&tag.long().unwrap().to_be_bytes());
} // NbtTag::Float(float) => unsafe {
// unchecked_extend(data, &float.to_be_bytes());
// },
}
TapeTagKind::Float => unsafe {
unchecked_extend(data, &tag.float().unwrap().to_be_bytes());
}, // NbtTag::Double(double) => {
// data.extend_from_slice(&double.to_be_bytes());
// }
},
TapeTagKind::Double => {
data.extend_from_slice(&tag.double().unwrap().to_be_bytes());
} // NbtTag::ByteArray(byte_array) => {
// unsafe {
// unchecked_extend(data, &byte_array.len().to_be_bytes());
// }
// data.extend_from_slice(byte_array);
// }
}
TapeTagKind::ByteArray => {
let byte_array = tag.byte_array().unwrap();
unsafe {
unchecked_extend(data, &byte_array.len().to_be_bytes());
}
data.extend_from_slice(byte_array);
} // NbtTag::String(string) => {
// write_string(data, string);
// }
}
TapeTagKind::String => {
let string = tag.string().unwrap();
write_string(data, string);
} // NbtTag::List(list) => {
// list.write(data);
// }
}
_ if kind.is_list() => {
tag.list().unwrap().write(data);
} // NbtTag::Compound(compound) => {
// compound.write(data);
// }
}
TapeTagKind::Compound => {
tag.compound().unwrap().write(data);
} // NbtTag::IntArray(int_array) => {
// unsafe {
// unchecked_extend(data, &int_array.len().to_be_bytes());
// }
// data.extend_from_slice(int_array.as_big_endian());
// }
}
TapeTagKind::IntArray => {
let int_array = list::u32_prefixed_list_to_rawlist::<i32>(
TapeTagKind::IntArray,
@ -136,12 +107,7 @@ impl<'a: 'tape, 'tape> NbtCompound<'a, 'tape> {
unchecked_extend(data, &int_array.len().to_be_bytes());
}
data.extend_from_slice(int_array.as_big_endian());
} // NbtTag::LongArray(long_array) => {
// unsafe {
// unchecked_extend(data, &long_array.len().to_be_bytes());
// }
// data.extend_from_slice(long_array.as_big_endian());
// }
}
TapeTagKind::LongArray => {
let long_array = list::u32_prefixed_list_to_rawlist::<i64>(
TapeTagKind::LongArray,

8
simdnbt/src/borrow/list.rs
View file

@ -666,8 +666,8 @@ impl<'a: 'tape, 'tape> Iterator for ListListIter<'a, 'tape> {
if self.current_tape_offset + 1 >= self.max_tape_offset {
return None;
}
let element = &self.tape[self.current_tape_offset];
let (kind, value) = unsafe { element.kind };
let element = unsafe { self.tape.as_ptr().add(self.current_tape_offset) };
let (kind, value) = unsafe { (*element).kind };
debug_assert!(kind.is_list());
let offset = u32::from(unsafe { value.list_list.1 }) as usize;
@ -769,8 +769,8 @@ impl<'a: 'tape, 'tape> Iterator for CompoundListIter<'a, 'tape> {
return None;
}
let element = &self.tape[self.current_tape_offset];
let (kind, value) = unsafe { element.kind };
let element = unsafe { self.tape.as_ptr().add(self.current_tape_offset) };
let (kind, value) = unsafe { (*element).kind };
debug_assert_eq!(kind, TapeTagKind::Compound);
let offset = u32::from(unsafe { value.compound_list.1 }) as usize;

4
simdnbt/src/borrow/tape.rs
View file

@ -83,7 +83,9 @@ impl TapeElement {
}
impl Debug for TapeElement {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "TapeElement")
// just writes the u64
write!(f, "TapeElement({:#016x})", unsafe { self.name })?;
Ok(())
}
}