fix(streaming/five): add missing lock in GetStreamingIndexForLocalHashKey#4069
Open
ShamZy9 wants to merge 1 commit into
Open
fix(streaming/five): add missing lock in GetStreamingIndexForLocalHashKey#4069ShamZy9 wants to merge 1 commit into
ShamZy9 wants to merge 1 commit into
Conversation
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.
Goal of this PR
Fix a data race in
streaming::GetStreamingIndexForLocalHashKey.The function reads
g_streamingHashStoresToIndiceswithout acquiringg_streamingMapMutex, whileAddStreamingFileWrapwrites to the same map under astd::unique_lock. The three sibling accessors (GetStreamingIndexForName,GetStreamingNameForIndex,GetStreamingBaseNameForHash) all correctly take astd::shared_lock; this one was missing it.A concurrent
find()on astd::mapwhile another thread inserts (rebalancing the tree) is undefined behavior and can cause intermittent crashes/corruption while custom streaming assets are being registered.How is this PR achieving the goal
Acquire
std::shared_lock _(g_streamingMapMutex);at the top of the function, matching the other accessors in the same file.This PR applies to the following area(s)
FiveM
Successfully tested on
Game builds: n/a (adds a missing lock, no functional change)
Platforms: Windows
Checklist