T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

table: fix up errnos. trap on internal failures.

Browse Source
This commit is contained in:
Pat Hickey
2021-01-25 12:16:07 -08:00
parent 957c434b67
commit 17a82c5b88
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/wasi-c2/src/table.rs
View File

@@ -29,7 +29,7 @@ impl Table {
self.next_key = self self.next_key = self
.next_key .next_key
.checked_add(1) .checked_add(1)
.ok_or_else(|| anyhow!("out of keys in table"))?; .ok_or_else(|| Error::trap("out of keys in table"))?;
if self.map.contains_key(&key) { if self.map.contains_key(&key) {
continue; continue;
} }
@@ -60,10 +60,10 @@ impl Table {
if r.is::<T>() { if r.is::<T>() {
Ok(Ref::map(r, |r| r.downcast_ref::<T>().unwrap())) Ok(Ref::map(r, |r| r.downcast_ref::<T>().unwrap()))
} else { } else {
Err(Error::exist().context("element is a different type")) Err(Error::badf().context("element is a different type"))
} }
} else { } else {
Err(Error::exist().context("element in table, but mutably borrowed")) Err(Error::trap("table get of mutably borrowed element"))
} }
} else { } else {
Err(Error::badf().context("key not in table")) Err(Error::badf().context("key not in table"))
@@ -76,10 +76,10 @@ impl Table {
if r.is::<T>() { if r.is::<T>() {
Ok(RefMut::map(r, |r| r.downcast_mut::<T>().unwrap())) Ok(RefMut::map(r, |r| r.downcast_mut::<T>().unwrap()))
} else { } else {
Err(Error::exist().context("element is a different type")) Err(Error::badf().context("element is a different type"))
} }
} else { } else {
Err(Error::exist().context("element in table, but borrowed")) Err(Error::trap("table get_mut of borrowed element"))
} }
} else { } else {
Err(Error::badf().context("key not in table")) Err(Error::badf().context("key not in table"))