fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-04-25 10:22:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix/fpcc-workaround

Browse Source
This commit is contained in:
Syrus Akbary 2020-03-11 21:51:31 -07:00 committed by GitHub
commit 7617350851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 119 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -4,6 +4,14 @@
- [#1283](https://github.com/wasmerio/wasmer/pull/1283) Workaround for floating point arguments and return values in `DynamicFunc`s. - [#1283](https://github.com/wasmerio/wasmer/pull/1283) Workaround for floating point arguments and return values in `DynamicFunc`s.
## 0.16.2 - 2020-03-11
- [#1294](https://github.com/wasmerio/wasmer/pull/1294) Fix bug related to system calls in WASI that rely on reading from WasmPtrs as arrays of length 0. `WasmPtr` will now succeed on length 0 arrays again.
## 0.16.1 - 2020-03-11
- [#1291](https://github.com/wasmerio/wasmer/pull/1291) Fix installation packaging script to package the `wax` command.
## 0.16.0 - 2020-03-11 ## 0.16.0 - 2020-03-11
- [#1286](https://github.com/wasmerio/wasmer/pull/1286) Updated Windows Wasmer icons. Add wax - [#1286](https://github.com/wasmerio/wasmer/pull/1286) Updated Windows Wasmer icons. Add wax

38
Cargo.lock generated
View File

@ -1820,7 +1820,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer" name = "wasmer"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"atty", "atty",
"byteorder", "byteorder",
@ -1851,7 +1851,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-clif-backend" name = "wasmer-clif-backend"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"cranelift-codegen", "cranelift-codegen",
@ -1902,14 +1902,14 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-dev-utils" name = "wasmer-dev-utils"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"libc", "libc",
] ]
[[package]] [[package]]
name = "wasmer-emscripten" name = "wasmer-emscripten"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"getrandom", "getrandom",
@ -1922,7 +1922,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-emscripten-tests" name = "wasmer-emscripten-tests"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"glob 0.3.0", "glob 0.3.0",
"wabt", "wabt",
@ -1936,7 +1936,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-interface-types" name = "wasmer-interface-types"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"nom", "nom",
"wast", "wast",
@ -1952,7 +1952,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-llvm-backend" name = "wasmer-llvm-backend"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"cc", "cc",
@ -1983,14 +1983,14 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-middleware-common" name = "wasmer-middleware-common"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"wasmer-runtime-core", "wasmer-runtime-core",
] ]
[[package]] [[package]]
name = "wasmer-middleware-common-tests" name = "wasmer-middleware-common-tests"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"criterion", "criterion",
"wabt", "wabt",
@ -2003,7 +2003,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-runtime" name = "wasmer-runtime"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"criterion", "criterion",
"lazy_static", "lazy_static",
@ -2020,7 +2020,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-runtime-c-api" name = "wasmer-runtime-c-api"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"cbindgen", "cbindgen",
"libc", "libc",
@ -2032,7 +2032,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-runtime-core" name = "wasmer-runtime-core"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"bincode", "bincode",
"blake3", "blake3",
@ -2060,7 +2060,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-runtime-core-tests" name = "wasmer-runtime-core-tests"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"wabt", "wabt",
"wasmer-clif-backend", "wasmer-clif-backend",
@ -2071,7 +2071,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-singlepass-backend" name = "wasmer-singlepass-backend"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"bincode", "bincode",
"byteorder", "byteorder",
@ -2088,7 +2088,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-spectests" name = "wasmer-spectests"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"glob 0.3.0", "glob 0.3.0",
"wabt", "wabt",
@ -2100,7 +2100,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-wasi" name = "wasmer-wasi"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"bincode", "bincode",
"byteorder", "byteorder",
@ -2117,7 +2117,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-wasi-experimental-io-devices" name = "wasmer-wasi-experimental-io-devices"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"log", "log",
"minifb", "minifb",
@ -2130,7 +2130,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-wasi-tests" name = "wasmer-wasi-tests"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"glob 0.3.0", "glob 0.3.0",
"wasmer-clif-backend", "wasmer-clif-backend",
@ -2143,7 +2143,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-win-exception-handler" name = "wasmer-win-exception-handler"
version = "0.16.0" version = "0.16.2"
dependencies = [ dependencies = [
"cmake", "cmake",
"libc", "libc",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer" name = "wasmer"
version = "0.16.0" version = "0.16.2"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
edition = "2018" edition = "2018"
repository = "https://github.com/wasmerio/wasmer" repository = "https://github.com/wasmerio/wasmer"

4
Makefile
View File

@ -288,8 +288,8 @@ build-install-package:
cp ./wapm-cli/target/release/wapm ./install/bin/ cp ./wapm-cli/target/release/wapm ./install/bin/
cp ./target/release/wasmer ./install/bin/ cp ./target/release/wasmer ./install/bin/
# Create the wax binary as symlink to wapm # Create the wax binary as symlink to wapm
cd ./install/bin/ && ln -s wapm wax cd ./install/bin/ && ln -sf wapm wax && chmod +x wax
tar -C ./install -zcvf wasmer.tar.gz bin/wapm bin/wasmer tar -C ./install -zcvf wasmer.tar.gz bin
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)

1
azure-pipelines.yml
View File

@ -300,6 +300,7 @@ jobs:
isDraft: false isDraft: false
isPreRelease: false isPreRelease: false
assets: '$(Build.ArtifactStagingDirectory)/**' assets: '$(Build.ArtifactStagingDirectory)/**'
assetUploadMode: 'replace' # Don't delete previously uploaded assets (default)
- job: Publish_Docs - job: Publish_Docs
dependsOn: dependsOn:

6
lib/clif-backend/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-clif-backend" name = "wasmer-clif-backend"
version = "0.16.0" version = "0.16.2"
description = "Wasmer runtime Cranelift compiler backend" description = "Wasmer runtime Cranelift compiler backend"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -11,7 +11,7 @@ edition = "2018"
readme = "README.md" readme = "README.md"
[dependencies] [dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.16.0" } wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" }
cranelift-native = "0.59.0" cranelift-native = "0.59.0"
cranelift-codegen = "0.59.0" cranelift-codegen = "0.59.0"
cranelift-entity = "0.59.0" cranelift-entity = "0.59.0"
@ -38,7 +38,7 @@ version = "0.0.7"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["errhandlingapi", "minwindef", "minwinbase", "winnt"] } winapi = { version = "0.3", features = ["errhandlingapi", "minwindef", "minwinbase", "winnt"] }
wasmer-win-exception-handler = { path = "../win-exception-handler", version = "0.16.0" } wasmer-win-exception-handler = { path = "../win-exception-handler", version = "0.16.2" }
[features] [features]
generate-debug-information = ["wasm-debug"] generate-debug-information = ["wasm-debug"]

2
lib/dev-utils/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-dev-utils" name = "wasmer-dev-utils"
version = "0.16.0" version = "0.16.2"
description = "Wasmer runtime core library" description = "Wasmer runtime core library"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]

14
lib/emscripten-tests/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-emscripten-tests" name = "wasmer-emscripten-tests"
version = "0.16.0" version = "0.16.2"
description = "Tests for our Emscripten implementation" description = "Tests for our Emscripten implementation"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -9,15 +9,15 @@ publish = false
build = "build/mod.rs" build = "build/mod.rs"
[dependencies] [dependencies]
wasmer-emscripten = { path = "../emscripten", version = "0.16.0" } wasmer-emscripten = { path = "../emscripten", version = "0.16.2" }
wasmer-runtime = { path = "../runtime", version = "0.16.0", default-features = false } wasmer-runtime = { path = "../runtime", version = "0.16.2", default-features = false }
wasmer-clif-backend = { path = "../clif-backend", version = "0.16.0", optional = true} wasmer-clif-backend = { path = "../clif-backend", version = "0.16.2", optional = true}
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.0", optional = true, features = ["test"] } wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", optional = true, features = ["test"] }
wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.0", optional = true } wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.2", optional = true }
[dev-dependencies] [dev-dependencies]
wabt = "0.9.1" wabt = "0.9.1"
wasmer-dev-utils = { path = "../dev-utils", version = "0.16.0"} wasmer-dev-utils = { path = "../dev-utils", version = "0.16.2"}
[build-dependencies] [build-dependencies]
glob = "0.3" glob = "0.3"

4
lib/emscripten/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-emscripten" name = "wasmer-emscripten"
version = "0.16.0" version = "0.16.2"
description = "Wasmer runtime emscripten implementation library" description = "Wasmer runtime emscripten implementation library"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -15,7 +15,7 @@ lazy_static = "1.4"
libc = "0.2.60" libc = "0.2.60"
log = "0.4" log = "0.4"
time = "0.1" time = "0.1"
wasmer-runtime-core = { path = "../runtime-core", version = "0.16.0" } wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
getrandom = "0.1" getrandom = "0.1"

2
lib/interface-types/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-interface-types" name = "wasmer-interface-types"
version = "0.16.0" version = "0.16.2"
description = "WebAssembly Interface Types library for Wasmer" description = "WebAssembly Interface Types library for Wasmer"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]

6
lib/llvm-backend-tests/Cargo.toml
View File

@ -9,8 +9,8 @@ edition = "2018"
[dependencies] [dependencies]
wabt = "0.9.1" wabt = "0.9.1"
wasmer-runtime-core = { path = "../runtime-core", version = "0.16.0" } wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" }
wasmer-runtime = { path = "../runtime", version = "0.16.0" } wasmer-runtime = { path = "../runtime", version = "0.16.2" }
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.0", features = ["test"] } wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", features = ["test"] }
[features] [features]

4
lib/llvm-backend/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-llvm-backend" name = "wasmer-llvm-backend"
version = "0.16.0" version = "0.16.2"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
repository = "https://github.com/wasmerio/wasmer" repository = "https://github.com/wasmerio/wasmer"
@ -10,7 +10,7 @@ edition = "2018"
readme = "README.md" readme = "README.md"
[dependencies] [dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.16.0", features = ["generate-debug-information-no-export-symbols"] } wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2", features = ["generate-debug-information-no-export-symbols"] }
wasmparser = "0.51.3" wasmparser = "0.51.3"
smallvec = "0.6" smallvec = "0.6"
goblin = "0.0.24" goblin = "0.0.24"

12
lib/middleware-common-tests/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-middleware-common-tests" name = "wasmer-middleware-common-tests"
version = "0.16.0" version = "0.16.2"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
edition = "2018" edition = "2018"
repository = "https://github.com/wasmerio/wasmer" repository = "https://github.com/wasmerio/wasmer"
@ -8,11 +8,11 @@ license = "MIT"
publish = false publish = false
[dependencies] [dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.16.0" } wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" }
wasmer-middleware-common = { path = "../middleware-common", version = "0.16.0" } wasmer-middleware-common = { path = "../middleware-common", version = "0.16.2" }
wasmer-clif-backend = { path = "../clif-backend", version = "0.16.0", optional = true } wasmer-clif-backend = { path = "../clif-backend", version = "0.16.2", optional = true }
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.0", features = ["test"], optional = true } wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", features = ["test"], optional = true }
wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.0", optional = true } wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.2", optional = true }
[features] [features]
clif = ["wasmer-clif-backend"] clif = ["wasmer-clif-backend"]

4
lib/middleware-common/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-middleware-common" name = "wasmer-middleware-common"
version = "0.16.0" version = "0.16.2"
repository = "https://github.com/wasmerio/wasmer" repository = "https://github.com/wasmerio/wasmer"
description = "Wasmer runtime common middlewares" description = "Wasmer runtime common middlewares"
license = "MIT" license = "MIT"
@ -10,4 +10,4 @@ categories = ["wasm"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.16.0" } wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" }

10
lib/runtime-c-api/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-runtime-c-api" name = "wasmer-runtime-c-api"
version = "0.16.0" version = "0.16.2"
description = "Wasmer C API library" description = "Wasmer C API library"
documentation = "https://wasmerio.github.io/wasmer/c/runtime-c-api/" documentation = "https://wasmerio.github.io/wasmer/c/runtime-c-api/"
license = "MIT" license = "MIT"
@ -20,22 +20,22 @@ libc = "0.2.60"
[dependencies.wasmer-runtime] [dependencies.wasmer-runtime]
default-features = false default-features = false
path = "../runtime" path = "../runtime"
version = "0.16.0" version = "0.16.2"
[dependencies.wasmer-runtime-core] [dependencies.wasmer-runtime-core]
default-features = false default-features = false
path = "../runtime-core" path = "../runtime-core"
version = "0.16.0" version = "0.16.2"
[dependencies.wasmer-wasi] [dependencies.wasmer-wasi]
default-features = false default-features = false
path = "../wasi" path = "../wasi"
version = "0.16.0" version = "0.16.2"
optional = true optional = true
[dependencies.wasmer-emscripten] [dependencies.wasmer-emscripten]
path = "../emscripten" path = "../emscripten"
version = "0.16.0" version = "0.16.2"
optional = true optional = true
[features] [features]

10
lib/runtime-core-tests/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-runtime-core-tests" name = "wasmer-runtime-core-tests"
version = "0.16.0" version = "0.16.2"
description = "Tests for the Wasmer runtime core crate" description = "Tests for the Wasmer runtime core crate"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -9,10 +9,10 @@ publish = false
[dependencies] [dependencies]
wabt = "0.9.1" wabt = "0.9.1"
wasmer-runtime-core = { path = "../runtime-core", version = "0.16.0" } wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" }
wasmer-clif-backend = { path = "../clif-backend", version = "0.16.0", optional = true } wasmer-clif-backend = { path = "../clif-backend", version = "0.16.2", optional = true }
wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.0", optional = true } wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.2", optional = true }
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.0", features = ["test"], optional = true } wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", features = ["test"], optional = true }
[features] [features]
default = ["backend-cranelift"] default = ["backend-cranelift"]

4
lib/runtime-core/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-runtime-core" name = "wasmer-runtime-core"
version = "0.16.0" version = "0.16.2"
description = "Wasmer runtime core library" description = "Wasmer runtime core library"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -59,3 +59,5 @@ generate-debug-information = ["wasm-debug"]
# don't export symbols related to the GDB JIT interafce, LLVM or some other native # don't export symbols related to the GDB JIT interafce, LLVM or some other native
# code will be providing them # code will be providing them
generate-debug-information-no-export-symbols = [] generate-debug-information-no-export-symbols = []
# enable DynamicFunc's for closures with captured environment.
dynamicfunc-fat-closures = []

30
lib/runtime-core/src/memory/ptr.rs
View File

@ -130,9 +130,10 @@ impl<T: Copy + ValueType> WasmPtr<T, Array> {
// for any index, we will always result an aligned memory access // for any index, we will always result an aligned memory access
let item_size = mem::size_of::<T>() + (mem::size_of::<T>() % mem::align_of::<T>()); let item_size = mem::size_of::<T>() + (mem::size_of::<T>() % mem::align_of::<T>());
let slice_full_len = index as usize + length as usize; let slice_full_len = index as usize + length as usize;
let memory_size = memory.size().bytes().0;
if (self.offset as usize) + (item_size * slice_full_len) > memory.size().bytes().0 if (self.offset as usize) + (item_size * slice_full_len) > memory_size
|| length == 0 || self.offset as usize >= memory_size
|| mem::size_of::<T>() == 0 || mem::size_of::<T>() == 0
{ {
return None; return None;
@ -167,9 +168,10 @@ impl<T: Copy + ValueType> WasmPtr<T, Array> {
// for any index, we will always result an aligned memory access // for any index, we will always result an aligned memory access
let item_size = mem::size_of::<T>() + (mem::size_of::<T>() % mem::align_of::<T>()); let item_size = mem::size_of::<T>() + (mem::size_of::<T>() % mem::align_of::<T>());
let slice_full_len = index as usize + length as usize; let slice_full_len = index as usize + length as usize;
let memory_size = memory.size().bytes().0;
if (self.offset as usize) + (item_size * slice_full_len) > memory.size().bytes().0 if (self.offset as usize) + (item_size * slice_full_len) > memory.size().bytes().0
|| length == 0 || self.offset as usize >= memory_size
|| mem::size_of::<T>() == 0 || mem::size_of::<T>() == 0
{ {
return None; return None;
@ -190,7 +192,11 @@ impl<T: Copy + ValueType> WasmPtr<T, Array> {
/// underlying data can be mutated if the Wasm is allowed to execute or /// underlying data can be mutated if the Wasm is allowed to execute or
/// an aliasing `WasmPtr` is used to mutate memory. /// an aliasing `WasmPtr` is used to mutate memory.
pub fn get_utf8_string(self, memory: &Memory, str_len: u32) -> Option<&str> { pub fn get_utf8_string(self, memory: &Memory, str_len: u32) -> Option<&str> {
if self.offset as usize + str_len as usize > memory.size().bytes().0 || str_len == 0 { let memory_size = memory.size().bytes().0;
if self.offset as usize + str_len as usize > memory.size().bytes().0
|| self.offset as usize >= memory_size
{
return None; return None;
} }
let ptr = unsafe { memory.view::<u8>().as_ptr().add(self.offset as usize) as *const u8 }; let ptr = unsafe { memory.view::<u8>().as_ptr().add(self.offset as usize) as *const u8 };
@ -271,15 +277,15 @@ mod test {
memory::MemoryDescriptor::new(Pages(1), Some(Pages(1)), false).unwrap(); memory::MemoryDescriptor::new(Pages(1), Some(Pages(1)), false).unwrap();
let memory = memory::Memory::new(memory_descriptor).unwrap(); let memory = memory::Memory::new(memory_descriptor).unwrap();
// test that basic access works and that len = 0 is caught correctly // test that basic access works and that len = 0 works, but oob does not
let start_wasm_ptr: WasmPtr<u8> = WasmPtr::new(0); let start_wasm_ptr: WasmPtr<u8> = WasmPtr::new(0);
let start_wasm_ptr_array: WasmPtr<u8, Array> = WasmPtr::new(0); let start_wasm_ptr_array: WasmPtr<u8, Array> = WasmPtr::new(0);
assert!(start_wasm_ptr.deref(&memory).is_some()); assert!(start_wasm_ptr.deref(&memory).is_some());
assert!(unsafe { start_wasm_ptr.deref_mut(&memory).is_some() }); assert!(unsafe { start_wasm_ptr.deref_mut(&memory).is_some() });
assert!(start_wasm_ptr_array.deref(&memory, 0, 0).is_none()); assert!(start_wasm_ptr_array.deref(&memory, 0, 0).is_some());
assert!(start_wasm_ptr_array.get_utf8_string(&memory, 0).is_none()); assert!(start_wasm_ptr_array.get_utf8_string(&memory, 0).is_some());
assert!(unsafe { start_wasm_ptr_array.deref_mut(&memory, 0, 0).is_none() }); assert!(unsafe { start_wasm_ptr_array.deref_mut(&memory, 0, 0).is_some() });
assert!(start_wasm_ptr_array.deref(&memory, 0, 1).is_some()); assert!(start_wasm_ptr_array.deref(&memory, 0, 1).is_some());
assert!(unsafe { start_wasm_ptr_array.deref_mut(&memory, 0, 1).is_some() }); assert!(unsafe { start_wasm_ptr_array.deref_mut(&memory, 0, 1).is_some() });
@ -293,7 +299,8 @@ mod test {
assert!(end_wasm_ptr_array.deref(&memory, 0, 1).is_some()); assert!(end_wasm_ptr_array.deref(&memory, 0, 1).is_some());
assert!(unsafe { end_wasm_ptr_array.deref_mut(&memory, 0, 1).is_some() }); assert!(unsafe { end_wasm_ptr_array.deref_mut(&memory, 0, 1).is_some() });
let invalid_idx_len_combos: [(u32, u32); 3] = [(0, 0), (0, 2), (1, 1)]; let invalid_idx_len_combos: [(u32, u32); 3] =
[(last_valid_address_for_u8 + 1, 0), (0, 2), (1, 1)];
for &(idx, len) in invalid_idx_len_combos.into_iter() { for &(idx, len) in invalid_idx_len_combos.into_iter() {
assert!(end_wasm_ptr_array.deref(&memory, idx, len).is_none()); assert!(end_wasm_ptr_array.deref(&memory, idx, len).is_none());
assert!(unsafe { end_wasm_ptr_array.deref_mut(&memory, idx, len).is_none() }); assert!(unsafe { end_wasm_ptr_array.deref_mut(&memory, idx, len).is_none() });
@ -323,7 +330,8 @@ mod test {
assert!(end_wasm_ptr_array.deref(&memory, 0, 1).is_some()); assert!(end_wasm_ptr_array.deref(&memory, 0, 1).is_some());
assert!(unsafe { end_wasm_ptr_array.deref_mut(&memory, 0, 1).is_some() }); assert!(unsafe { end_wasm_ptr_array.deref_mut(&memory, 0, 1).is_some() });
let invalid_idx_len_combos: [(u32, u32); 4] = [(0, 0), (1, 0), (0, 2), (1, 1)]; let invalid_idx_len_combos: [(u32, u32); 3] =
[(last_valid_address_for_u32 + 1, 0), (0, 2), (1, 1)];
for &(idx, len) in invalid_idx_len_combos.into_iter() { for &(idx, len) in invalid_idx_len_combos.into_iter() {
assert!(end_wasm_ptr_array.deref(&memory, idx, len).is_none()); assert!(end_wasm_ptr_array.deref(&memory, idx, len).is_none());
assert!(unsafe { end_wasm_ptr_array.deref_mut(&memory, idx, len).is_none() }); assert!(unsafe { end_wasm_ptr_array.deref_mut(&memory, idx, len).is_none() });
@ -339,8 +347,6 @@ mod test {
for oob_end_array_ptr in end_wasm_ptr_array_oob_array.into_iter() { for oob_end_array_ptr in end_wasm_ptr_array_oob_array.into_iter() {
assert!(oob_end_array_ptr.deref(&memory, 0, 1).is_none()); assert!(oob_end_array_ptr.deref(&memory, 0, 1).is_none());
assert!(unsafe { oob_end_array_ptr.deref_mut(&memory, 0, 1).is_none() }); assert!(unsafe { oob_end_array_ptr.deref_mut(&memory, 0, 1).is_none() });
assert!(oob_end_array_ptr.deref(&memory, 0, 0).is_none());
assert!(unsafe { oob_end_array_ptr.deref_mut(&memory, 0, 0).is_none() });
assert!(oob_end_array_ptr.deref(&memory, 1, 0).is_none()); assert!(oob_end_array_ptr.deref(&memory, 1, 0).is_none());
assert!(unsafe { oob_end_array_ptr.deref_mut(&memory, 1, 0).is_none() }); assert!(unsafe { oob_end_array_ptr.deref_mut(&memory, 1, 0).is_none() });
} }

5
lib/runtime-core/src/typed_func.rs
View File

@ -375,9 +375,8 @@ impl<'a> DynamicFunc<'a> {
} }
} }
// Disable "fat" closures for possible future changes. if cfg!(not(feature = "dynamicfunc-fat-closures")) && mem::size_of::<F>() != 0 {
if mem::size_of::<F>() != 0 { unimplemented!("DynamicFunc with captured environment is disabled");
unimplemented!("DynamicFunc with captured environment is not yet supported");
} }
let mut builder = TrampolineBufferBuilder::new(); let mut builder = TrampolineBufferBuilder::new();

8
lib/runtime/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-runtime" name = "wasmer-runtime"
version = "0.16.0" version = "0.16.2"
description = "Wasmer runtime library" description = "Wasmer runtime library"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -11,17 +11,17 @@ edition = "2018"
readme = "README.md" readme = "README.md"
[dependencies] [dependencies]
wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.0", optional = true } wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.2", optional = true }
lazy_static = "1.4" lazy_static = "1.4"
memmap = "0.7" memmap = "0.7"
[dependencies.wasmer-runtime-core] [dependencies.wasmer-runtime-core]
path = "../runtime-core" path = "../runtime-core"
version = "0.16.0" version = "0.16.2"
[dependencies.wasmer-clif-backend] [dependencies.wasmer-clif-backend]
path = "../clif-backend" path = "../clif-backend"
version = "0.16.0" version = "0.16.2"
optional = true optional = true
# Dependencies for caching. # Dependencies for caching.

4
lib/singlepass-backend/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-singlepass-backend" name = "wasmer-singlepass-backend"
version = "0.16.0" version = "0.16.2"
repository = "https://github.com/wasmerio/wasmer" repository = "https://github.com/wasmerio/wasmer"
description = "Wasmer runtime single pass compiler backend" description = "Wasmer runtime single pass compiler backend"
license = "MIT" license = "MIT"
@ -11,7 +11,7 @@ edition = "2018"
readme = "README.md" readme = "README.md"
[dependencies] [dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.16.0" } wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" }
dynasm = "0.5" dynasm = "0.5"
dynasmrt = "0.5" dynasmrt = "0.5"
lazy_static = "1.4" lazy_static = "1.4"

10
lib/spectests/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-spectests" name = "wasmer-spectests"
version = "0.16.0" version = "0.16.2"
description = "Wasmer spectests library" description = "Wasmer spectests library"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -9,10 +9,10 @@ edition = "2018"
[dependencies] [dependencies]
glob = "0.3" glob = "0.3"
wasmer-runtime = { path = "../runtime", version = "0.16.0", default-features = false} wasmer-runtime = { path = "../runtime", version = "0.16.2", default-features = false}
wasmer-clif-backend = { path = "../clif-backend", version = "0.16.0", optional = true} wasmer-clif-backend = { path = "../clif-backend", version = "0.16.2", optional = true}
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.0", features = ["test"], optional = true } wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", features = ["test"], optional = true }
wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.0", optional = true } wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.2", optional = true }
[build-dependencies] [build-dependencies]
wabt = "0.9.1" wabt = "0.9.1"

6
lib/wasi-experimental-io-devices/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-wasi-experimental-io-devices" name = "wasmer-wasi-experimental-io-devices"
version = "0.16.0" version = "0.16.2"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
edition = "2018" edition = "2018"
repository = "https://github.com/wasmerio/wasmer" repository = "https://github.com/wasmerio/wasmer"
@ -14,8 +14,8 @@ maintenance = { status = "experimental" }
[dependencies] [dependencies]
log = "0.4" log = "0.4"
minifb = "0.13" minifb = "0.13"
wasmer-wasi = { version = "0.16.0", path = "../wasi" } wasmer-wasi = { version = "0.16.2", path = "../wasi" }
wasmer-runtime-core = { version = "0.16.0", path = "../runtime-core" } wasmer-runtime-core = { version = "0.16.2", path = "../runtime-core" }
ref_thread_local = "0.0" ref_thread_local = "0.0"
serde = "1" serde = "1"
typetag = "0.1" typetag = "0.1"

14
lib/wasi-tests/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-wasi-tests" name = "wasmer-wasi-tests"
version = "0.16.0" version = "0.16.2"
description = "Tests for our WASI implementation" description = "Tests for our WASI implementation"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -10,18 +10,18 @@ build = "build/mod.rs"
[dependencies] [dependencies]
# We set default features to false to be able to use the singlepass backend properly # We set default features to false to be able to use the singlepass backend properly
wasmer-runtime = { path = "../runtime", version = "0.16.0", default-features = false } wasmer-runtime = { path = "../runtime", version = "0.16.2", default-features = false }
wasmer-wasi = { path = "../wasi", version = "0.16.0" } wasmer-wasi = { path = "../wasi", version = "0.16.2" }
# hack to get tests to work # hack to get tests to work
wasmer-clif-backend = { path = "../clif-backend", version = "0.16.0", optional = true} wasmer-clif-backend = { path = "../clif-backend", version = "0.16.2", optional = true}
wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.0", optional = true } wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.2", optional = true }
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.0", features = ["test"], optional = true } wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", features = ["test"], optional = true }
[build-dependencies] [build-dependencies]
glob = "0.3" glob = "0.3"
[dev-dependencies] [dev-dependencies]
wasmer-dev-utils = { path = "../dev-utils", version = "0.16.0"} wasmer-dev-utils = { path = "../dev-utils", version = "0.16.2"}
[features] [features]
clif = ["wasmer-clif-backend", "wasmer-runtime/default-backend-cranelift"] clif = ["wasmer-clif-backend", "wasmer-runtime/default-backend-cranelift"]

4
lib/wasi/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-wasi" name = "wasmer-wasi"
version = "0.16.0" version = "0.16.2"
description = "Wasmer runtime WASI implementation library" description = "Wasmer runtime WASI implementation library"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -19,7 +19,7 @@ getrandom = "0.1"
time = "0.1" time = "0.1"
typetag = "0.1" typetag = "0.1"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
wasmer-runtime-core = { path = "../runtime-core", version = "0.16.0" } wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winapi = "0.3" winapi = "0.3"

4
lib/win-exception-handler/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-win-exception-handler" name = "wasmer-win-exception-handler"
version = "0.16.0" version = "0.16.2"
description = "Wasmer runtime exception handling for Windows" description = "Wasmer runtime exception handling for Windows"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -8,7 +8,7 @@ repository = "https://github.com/wasmerio/wasmer"
edition = "2018" edition = "2018"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.16.0" } wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" }
winapi = { version = "0.3.8", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] } winapi = { version = "0.3.8", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] }
libc = "0.2.60" libc = "0.2.60"

4
scripts/update_version_numbers.sh
View File

@ -1,5 +1,5 @@
PREVIOUS_VERSION='0.15.0' PREVIOUS_VERSION='0.16.1'
NEXT_VERSION='0.16.0' NEXT_VERSION='0.16.2'
# quick hack # quick hack
fd Cargo.toml --exec sed -i '' "s/version = \"$PREVIOUS_VERSION\"/version = \"$NEXT_VERSION\"/" fd Cargo.toml --exec sed -i '' "s/version = \"$PREVIOUS_VERSION\"/version = \"$NEXT_VERSION\"/"

2
src/installer/wasmer.iss
View File

@ -1,6 +1,6 @@
[Setup] [Setup]
AppName=Wasmer AppName=Wasmer
AppVersion=0.16.0 AppVersion=0.16.2
DefaultDirName={pf}\Wasmer DefaultDirName={pf}\Wasmer
DefaultGroupName=Wasmer DefaultGroupName=Wasmer
Compression=lzma2 Compression=lzma2