Handle overflow errors in Bytes -> Pages conversion #1914
Conversation
webmaster128
requested review from
Hywan,
MarkMcCaskey,
nlewycky and
syrusakbary
as code owners
webmaster128
force-pushed
the
bytes-to-pages
branch
from
afc879a to
fd9e851
Compare
lib/wasmer-types/src/units.rs
Outdated
| impl From<Bytes> for Pages { | ||
| fn from(bytes: Bytes) -> Self { | ||
| Self((bytes.0 / WASM_PAGE_SIZE) as u32) | ||
| const PAGES_EXCEED_UINT32: &'static str = "Number of pages exceeds uint32 range"; |
There was a problem hiding this comment.
You don't need a constant here. The constant is used only once.
There was a problem hiding this comment.
I can inline it, no problem. Do you prefer that?
lib/wasmer-types/src/units.rs
Outdated
| .try_into() | ||
| .or(Err(PAGES_EXCEED_UINT32))?; |
There was a problem hiding this comment.
I believe you can write:
| .try_into() | |
| .or(Err(PAGES_EXCEED_UINT32))?; | |
| .try_into() | |
| .map_err(PAGES_EXCEED_UINT32)?; |
There was a problem hiding this comment.
map_err takes a callback, which is what I wanted to avoid. It would have to be
.map_err(|_original_error| PAGES_EXCEED_UINT32)?;However, we can use this as well. Which way do you like more?
webmaster128
force-pushed
the
bytes-to-pages
branch
from
fd9e851 to
59fb850
Compare
|
Thanks for the positive feedback @Hywan. After looking at the error again I thought we better do this properly and use an error type instead of a generic string. This shows the user's type system that there there is only one possible error reason that in many use cases can be handled by defauling to |
|
bors r+ |
Description
Before the Bytes to Pages conversion silently returned wrong results when the number of pages was too large.
Review