From bcfb75b78eff01ae8324bbb13824361ce8b03d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <mich@elmueller.net>
Date: Tue, 22 Jan 2019 09:45:03 +0100
Subject: [PATCH] Get rid of memcpy in to_vec() (#1512)
---
substrate/core/sr-io/without_std.rs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/substrate/core/sr-io/without_std.rs b/substrate/core/sr-io/without_std.rs
index cc20aff96a0..c1bee278000 100644
--- a/substrate/core/sr-io/without_std.rs
+++ b/substrate/core/sr-io/without_std.rs
@@ -283,9 +283,10 @@ pub fn child_storage_root(storage_key: &[u8]) -> Option<Vec<u8>> {
if length == u32::max_value() {
None
} else {
- let ret = slice::from_raw_parts(ptr, length as usize).to_vec();
- ext_free(ptr);
- Some(ret)
+ // Invariants required by Vec::from_raw_parts are not formally fulfilled.
+ // We don't allocate via String/Vec<T>, but use a custom allocator instead.
+ // See #300 for more details.
+ Some(<Vec<u8>>::from_raw_parts(ptr, length as usize, length as usize))
}
}
}
--
GitLab