Conversation
Member
|
We cannot fix Oboe source code directly. If you need, report the issue to github.com/google/oboe |
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.
What issue is this addressing?
No issue filed yet. Found during an audit of the vendored Oboe sources (Oboe 1.11.0).
What type of issue is this addressing?
bug
What this PR does | solves
In
OutputMixerOpenSL::open(internal/oboe/oboe_opensles_OutputMixerOpenSLES_android.cpp), the error path callsclose()whilemLockis still held byopen()itself:std::mutexis not recursive, so any failure ofcreateOutputMixorRealizedeadlocks the calling thread insideopen().The fix
Split the body of
close()intocloseLocked(), which assumesmLockis already held:open()'s error path callscloseLocked()directly.close()keeps the same contract and just wrapscloseLocked()with the lock.This mirrors the
*Lockednaming already used elsewhere in the binding (binding_android.cpphasStartLocked,StopLocked, etc.).Note: this file is vendored from Oboe 1.11.0 by
internal/oboe/gen.go; the same fix would ideally be applied upstream in google/oboe as well.