Try again to fix Coverity warning in SDL Sound #3005
Merged
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
The previous PR did not solve the issue. Coverity saw my assert and still thinks it's freeing from the middle of the list.
It's possible it is seeing a data race. I've removed the use of the volatile keyword and used a mutex lock around the entire loop.
Sound_FreeSample
also takes a lock but SDL's mutex is recursive so this should be fine.This also removes a temporary variable that was maybe confusing Coverity. Now
Sound_FreeSample
is explicitly being called withsample_list
(head of the linked list).Related issues
#2996
Manual testing
Started Quake with ripped .ogg sound files. Closed Dosbox and confirmed there was no crashes or deadlocks.
Checklist
Please tick the items as you have addressed them. Don't remove items; leave the ones that are not applicable unchecked.
I have: