-
Notifications
You must be signed in to change notification settings - Fork 156
Do not leak Sendable extensions to consumers #848
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c81fe0c
Do not leak NSMapTable Sendability
dfed 93c8d25
Even less leaking
dfed e6b298e
add change file
dfed 80ee688
Add back @unchecked for types that effectively are sendable
dfed 155fd9c
no trailing whitespace
dfed 8793a61
Move
pblazej File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| patch type="changed" "Removed '@unchecked Sendable' extensions on common types" |
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
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. let's move it to |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright 2025 LiveKit | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import Foundation | ||
|
|
||
| /// A thin unchecked sendable wrapper around NSMapTable. | ||
| final class MapTable<KeyType, ObjectType>: @unchecked Sendable where KeyType: AnyObject, ObjectType: AnyObject { | ||
pblazej marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| init(_ mapTable: NSMapTable<KeyType, ObjectType>) { | ||
| self.mapTable = mapTable | ||
| } | ||
|
|
||
| class func weakToStrongObjects() -> MapTable<KeyType, ObjectType> { | ||
| .init(.weakToStrongObjects()) | ||
| } | ||
|
|
||
| func object(forKey aKey: KeyType?) -> ObjectType? { | ||
| mapTable.object(forKey: aKey) | ||
| } | ||
|
|
||
| func removeObject(forKey aKey: KeyType?) { | ||
| mapTable.removeObject(forKey: aKey) | ||
| } | ||
|
|
||
| func setObject(_ anObject: ObjectType?, forKey aKey: KeyType?) { | ||
| mapTable.setObject(anObject, forKey: aKey) | ||
| } | ||
|
|
||
| var count: Int { | ||
| mapTable.count | ||
| } | ||
|
|
||
| func objectEnumerator() -> NSEnumerator? { | ||
| mapTable.objectEnumerator() | ||
| } | ||
|
|
||
| func removeAllObjects() { | ||
| mapTable.removeAllObjects() | ||
| } | ||
|
|
||
| private let mapTable: NSMapTable<KeyType, ObjectType> | ||
| } | ||
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
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.