neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-03-05 17:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

io/region: accept incomplete block for final chunk

Browse source
This commit is contained in:
Matthias Schiffer 2023-01-30 00:45:05 +01:00
parent 92a9bb3bb3
commit 6186a0d916
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/io/region.rs
View file

@ -42,14 +42,6 @@ fn decode_chunk<T>(buf: &[u8]) -> Result<T>
where where
T: DeserializeOwned, T: DeserializeOwned,
{ {
let (len_bytes, buf) = buf.split_at(4);
let len = u32::from_be_bytes(len_bytes.try_into().unwrap()) as usize;
if len < 1 || len > buf.len() {
bail!("Invalid chunk size");
}
let buf = &buf[..len];
let (format, buf) = buf.split_at(1); let (format, buf) = buf.split_at(1);
if format[0] != 2 { if format[0] != 2 {
bail!("Unknown chunk format"); bail!("Unknown chunk format");
@ -92,7 +84,6 @@ impl<R: Read + Seek> Region<R> {
while !chunk_map.is_empty() { while !chunk_map.is_empty() {
let Some(ChunkDesc { coords, len }) = chunk_map.remove(&index) else { let Some(ChunkDesc { coords, len }) = chunk_map.remove(&index) else {
reader.seek(SeekFrom::Current(BLOCKSIZE as i64)).context("Failed to seek chunk data")?;
index += 1; index += 1;
continue; continue;
}; };
@ -102,7 +93,20 @@ impl<R: Read + Seek> Region<R> {
} }
seen[coords] = true; seen[coords] = true;
let mut buffer = vec![0; (len as usize) * BLOCKSIZE]; reader
.seek(SeekFrom::Start(index as u64 * BLOCKSIZE as u64))
.context("Failed to seek chunk data")?;
let mut len_buf = [0u8; 4];
reader
.read_exact(&mut len_buf)
.with_context(|| format!("Failed to read length for chunk {:?}", coords))?;
let byte_len = u32::from_be_bytes(len_buf) as usize;
if byte_len < 1 || byte_len > (len as usize) * BLOCKSIZE - 4 {
bail!("Invalid length for chunk {:?}", coords);
}
let mut buffer = vec![0; byte_len];
reader reader
.read_exact(&mut buffer) .read_exact(&mut buffer)
.with_context(|| format!("Failed to read data for chunk {:?}", coords))?; .with_context(|| format!("Failed to read data for chunk {:?}", coords))?;