Fix panic in Promise::try_result #585
Merged
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
Contributor
|
it seems like you haven't added any nanpa changeset files to this PR. if this pull request includes changes to code, make sure to add a changeset, by writing a file to refer to the manpage for more information. |
theomonnom
reviewed
Mar 3, 2025
livekit-protocol/src/promise.rs
Outdated
|
|
||
| pub fn try_result(&self) -> Option<T> { | ||
| self.result.try_lock().unwrap().clone() | ||
| self.result.try_read().unwrap().clone() |
Member
There was a problem hiding this comment.
isn't try_read also panicking? when unwrapping?
Contributor
Author
There was a problem hiding this comment.
Oh, good catch! Thank you. I believe a panic would occur if a write lock is held.
So in this case, I'll modify it to return None instead of unwrapping. Since Promise is designed to acquire the write lock only once, this should not be an issue.
theomonnom
approved these changes
Mar 3, 2025
bcherry
approved these changes
Mar 3, 2025
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.
Panic occurring in
Promise::try_resultis undesirable, so it has been replaced with RwLock to prevent panics.