Explicitly link against rlibc to get non buggy version of memcpy (#1049)

* Explicitly link against rlibc to get non-buggy version of memcpy * Revert "Disable overflow checks for examples (#1034)" This reverts commit b2256d9.
use-ink · Nov 26, 2021 · fb86286 · fb86286
1 parent 74edbfa
commit fb86286
Show file tree

Hide file tree

Showing 19 changed files with 5 additions and 68 deletions.
diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml
@@ -30,6 +30,7 @@ static_assertions = "1.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 libsecp256k1 = { version = "0.7.0", default-features = false }
+rlibc = "1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 ink_engine = { version = "3.0.0-rc7", path = "../engine/", default-features = false, optional = true }

diff --git a/crates/env/src/lib.rs b/crates/env/src/lib.rs
@@ -43,6 +43,10 @@
     unused_extern_crates
 )]
 
+#[cfg(all(not(feature = "std"), target_arch = "wasm32"))]
+#[allow(unused_extern_crates)]
+extern crate rlibc;
+
 #[cfg(all(not(feature = "std"), target_arch = "wasm32"))]
 #[allow(unused_variables)]
 #[panic_handler]

diff --git a/examples/contract-terminate/Cargo.toml b/examples/contract-terminate/Cargo.toml
@@ -19,10 +19,6 @@ name = "contract_terminate"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/contract-transfer/Cargo.toml b/examples/contract-transfer/Cargo.toml
@@ -20,10 +20,6 @@ name = "contract_transfer"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/delegator/Cargo.toml b/examples/delegator/Cargo.toml
@@ -23,10 +23,6 @@ name = "delegator"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/delegator/accumulator/Cargo.toml b/examples/delegator/accumulator/Cargo.toml
@@ -24,10 +24,6 @@ crate-type = [
     "rlib",
 ]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/delegator/adder/Cargo.toml b/examples/delegator/adder/Cargo.toml
@@ -26,10 +26,6 @@ crate-type = [
     "rlib",
 ]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/delegator/subber/Cargo.toml b/examples/delegator/subber/Cargo.toml
@@ -26,10 +26,6 @@ crate-type = [
     "rlib",
 ]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/dns/Cargo.toml b/examples/dns/Cargo.toml
@@ -19,10 +19,6 @@ name = "dns"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/erc1155/Cargo.toml b/examples/erc1155/Cargo.toml
@@ -20,10 +20,6 @@ name = "erc1155"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/erc20/Cargo.toml b/examples/erc20/Cargo.toml
@@ -19,10 +19,6 @@ name = "erc20"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/erc721/Cargo.toml b/examples/erc721/Cargo.toml
@@ -19,10 +19,6 @@ name = "erc721"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/flipper/Cargo.toml b/examples/flipper/Cargo.toml
@@ -19,10 +19,6 @@ name = "flipper"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/incrementer/Cargo.toml b/examples/incrementer/Cargo.toml
@@ -19,10 +19,6 @@ name = "incrementer"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/multisig/Cargo.toml b/examples/multisig/Cargo.toml
@@ -20,10 +20,6 @@ name = "multisig"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/rand-extension/Cargo.toml b/examples/rand-extension/Cargo.toml
@@ -19,10 +19,6 @@ name = "rand_extension"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/trait-erc20/Cargo.toml b/examples/trait-erc20/Cargo.toml
@@ -19,10 +19,6 @@ name = "trait_erc20"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/trait-flipper/Cargo.toml b/examples/trait-flipper/Cargo.toml
@@ -19,10 +19,6 @@ name = "trait_flipper"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [

diff --git a/examples/trait-incrementer/Cargo.toml b/examples/trait-incrementer/Cargo.toml
@@ -19,10 +19,6 @@ name = "trait_incrementer"
 path = "lib.rs"
 crate-type = ["cdylib"]
 
-# Needed until https://github.com/paritytech/ink/issues/364 is resolved.
-[profile.release]
-overflow-checks = false
-
 [features]
 default = ["std"]
 std = [