Merge pull request #1246 from Phala-Network/fix-trie

jasl · web-flow · commit 9e137ec6b46c · 2023-04-13T22:33:55.000+08:00
pruntime: Fix trie node corruption
diff --git a/crates/pink/runner/src/storage.rs b/crates/pink/runner/src/storage.rs
@@ -28,10 +28,11 @@ impl ClusterStorage {
         match self.kv_store.get_mut(&key) {
             Some((ref mut old_rc, ref mut old_value)) => {
                 *old_rc += rc;
+                if rc > 0 {
+                    *old_value = value;
+                }
                 if *old_rc == 0 {
                     self.kv_store.remove(&key);
-                } else {
-                    *old_value = value;
                 }
             }
             None => {

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,11 @@ impl ClusterStorage {`
`28`	`28`	`match self.kv_store.get_mut(&key) {`
`29`	`29`	`Some((ref mut old_rc, ref mut old_value)) => {`
`30`	`30`	`*old_rc += rc;`
	`31`	`+ if rc > 0 {`
	`32`	`+ *old_value = value;`
	`33`	`+ }`
`31`	`34`	`if *old_rc == 0 {`
`32`	`35`	`self.kv_store.remove(&key);`
`33`		`- } else {`
`34`		`- *old_value = value;`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`	`None => {`