emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[array (rust)] Fix building uncontiguous array

Browse Source
This commit is contained in:
Ming-Hung Tsai 2021-09-07 16:13:41 +08:00
parent 2f22a8c55d
commit bb53083271
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pdata/array_builder.rs
View File

@ -59,8 +59,7 @@ impl<V: Unpack + Pack + Clone + Default> ArrayBlockBuilder<V> {
let bi = index / self.entries_per_block as u64; let bi = index / self.entries_per_block as u64;
let i = (index % self.entries_per_block as u64) as usize; let i = (index % self.entries_per_block as u64) as usize;
if bi < self.array_blocks.len() as u64 || i < self.values.len() || index >= self.nr_entries if index >= self.nr_entries {
{
return Err(anyhow!("array index out of bounds")); return Err(anyhow!("array index out of bounds"));
} }
@ -68,8 +67,12 @@ impl<V: Unpack + Pack + Clone + Default> ArrayBlockBuilder<V> {
self.emit_block(w)?; self.emit_block(w)?;
} }
if i > self.values.len() + 1 { if bi < self.array_blocks.len() as u64 || i < self.values.len() {
self.values.resize_with(i - 1, Default::default); return Err(anyhow!("unordered array index"));
}
if i > self.values.len() {
self.values.resize_with(i, Default::default);
} }
self.values.push(v); self.values.push(v);