fix: closure capture race in generateTrieRoot goroutines #33306
Closed
+20
−14
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed a closure capture bug where the goroutine inside generateTrieRoot captured the loop variable holding a decoded StateAccount, which was then reassigned in subsequent iterations. Because Go closures capture variables by reference, concurrent goroutines could observe the mutated variable and read CodeHash and Root from the wrong account, producing spurious “invalid subroot” errors and introducing a data race. The fix renames the local variable to acc for clarity and, more importantly, computes fixed values for hash, codeHash, and wantRoot before spawning the goroutine and passes them as parameters, ensuring each goroutine operates on the correct account snapshot. The same correction is applied in both triedb/pathdb/verifier.go and core/state/snapshot/conversion.go to maintain consistent and safe behavior across code paths that rebuild or verify trie state.