github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

runtime: lock sled overlay for the entire duration of merkle::merkle_add() [safety rzns]

Browse Source
This commit is contained in:
zero
2024-03-18 15:58:03 +01:00
parent c5166445d7
commit 66b44abc78
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/runtime/import/merkle.rs
View File

@@ -164,17 +164,11 @@ pub(crate) fn merkle_add(mut ctx: FunctionEnvMut<Env>, ptr: WasmPtr<u8>, len: u3
return darkfi_sdk::error::INTERNAL_ERROR
}
// TODO: FIXME locking should happen for the entire duration of this fn. This is unsafe otherwise.
// Locking should happen for the entire duration of this fn. This is unsafe otherwise.
let lock = env.blockchain.lock().unwrap();
let mut overlay = lock.overlay.lock().unwrap();
// Read the current tree
let ret = match env
.blockchain
.lock()
.unwrap()
.overlay
.lock()
.unwrap()
.get(&db_info.tree, &tree_key)
{
let ret = match overlay.get(&db_info.tree, &tree_key) {
Ok(v) => v,
Err(e) => {
error!(
@@ -255,8 +249,6 @@ pub(crate) fn merkle_add(mut ctx: FunctionEnvMut<Env>, ptr: WasmPtr<u8>, len: u3
}
// Apply changes to overlay
let lock = env.blockchain.lock().unwrap();
let mut overlay = lock.overlay.lock().unwrap();
if overlay.insert(&db_info.tree, &tree_key, &tree_data).is_err() {
error!(
target: "runtime::merkle::merkle_add",