[Fix]: concurrent conflict in Cache.CopyTo#3860
Merged
NGDAdmin merged 4 commits intoneo-project:masterfrom Apr 2, 2025
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a concurrency issue in the Cache.CopyTo method by ensuring that both the count check and the iteration over cache entries are performed under a read lock.
- Introduces a read lock for the entire operation.
- Replaces iteration over the Cache instance with iteration over InnerDictionary.Values.
- Updates the assignment to extract the underlying cached value.
Comments suppressed due to low confidence (2)
src/Neo.IO/Caching/Cache.cs:164
- This change from using 'this' to 'InnerDictionary.Values' ensures iteration under the read lock, but please verify that it retains any important logic from the original iterator implementation.
foreach (var item in InnerDictionary.Values)
src/Neo.IO/Caching/Cache.cs:166
- Ensure that accessing 'item.Value' correctly retrieves the intended TValue, and verify that this change does not inadvertently omit any necessary conversion or handling previously provided by the original iteration.
array[startIndex++] = item.Value;
Jim8y
approved these changes
Apr 1, 2025
shargon
approved these changes
Apr 1, 2025
Member
|
@Wi1l-B0t the workflow fails |
Contributor
Author
|
Jim8y
added a commit
to Jim8y/neo
that referenced
this pull request
Apr 9, 2025
* master: (163 commits) [style] Added some var styles (neo-project#3867) [`fix`] stop syncing on block 1465790 (neo-project#3888) Optimize block deserialization (neo-project#3879) Avoid double `ToArray` on `OnInvMessageReceived` (neo-project#3875) style: format long lines (neo-project#3884) optimize: return GetFileNameWithoutExtension(Path) if name is not set (neo-project#3883) Fix possible null exception (neo-project#3880) Remove linkedList (neo-project#3873) Optimize Uint160 and Uint256 constructor (neo-project#3872) Release the resources (neo-project#3868) [Clean] Remove `IRawReadOnlyStore` (neo-project#3869) move non-plugins out of plugins (neo-project#3863) feature: set name when create wallet (neo-project#3866) Native: swap Policy's `[get/set]AttributeFee` implementations (neo-project#3859) Fix: concurrent conflict in Cache.CopyTo (neo-project#3860) Fix: add default key parameter in help cmd (neo-project#3865) [Plugin UT] add more rpcserver UTs (neo-project#3864) config: upgrade NeoFS chains protocol configuration (neo-project#3858) [`Optimization`]: add exception message to `ArgumentException` (neo-project#3862) Native: unify arguments naming of CryptoLib's `verifyWith*` methods (neo-project#3855) ... # Conflicts: # benchmarks/Neo.VM.Benchmarks/OpCode/Arrays/OpCode.ReverseN.cs # benchmarks/Neo.VM.Benchmarks/Program.cs # src/Neo/Neo.csproj # src/Neo/ProtocolSettings.cs # src/Neo/SmartContract/ApplicationEngine.cs # src/Neo/SmartContract/Native/NeoToken.cs # src/Neo/SmartContract/Native/RoleManagement.cs # tests/Neo.UnitTests/SmartContract/Manifest/UT_ContractManifest.cs # tests/Neo.UnitTests/SmartContract/Manifest/UT_ContractPermission.cs # tests/Neo.UnitTests/SmartContract/Native/UT_NativeContract.cs # tests/Neo.UnitTests/SmartContract/Native/UT_NeoToken.cs # tests/Neo.UnitTests/UT_ProtocolSettings.cs # tests/Neo.VM.Tests/UT_ReferenceCounter.cs
cschuchardt88
pushed a commit
to cschuchardt88/neo
that referenced
this pull request
Jun 8, 2025
Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Get
InnerDictionary.CountinCacheshould be protected by lockType of change
Checklist: