fix: Ensure pthread_mutexattr_t is properly cleaned up with pthread_mutexattr_destroy in Lock#3480
Merged
Lukasa merged 2 commits intoapple:mainfrom Jan 19, 2026
Merged
Conversation
4c03edf to
3052032
Compare
Contributor
|
Mind cleaning up the soundness script report? |
3052032 to
0d517fe
Compare
Contributor
Author
kukushechkin
pushed a commit
to apple/swift-log
that referenced
this pull request
Feb 12, 2026
…408) Ports changes to `Lock` from swift-nio to swift-log. ### Motivation: The copy-paste of `Lock` in swift-log should be updated with changes from swift-nio. ### Modifications: - Rolls back changed [made previously for FreeBSD](https://github.com/apple/swift-log/pull/387/changes#diff-7b1bd45403dd1a7418287bd60682bf05ba2e4bf75dca1c0ca55a86d0477c9af5L73) in favor of a consolidated implementation in swift-nio that will be in place once apple/swift-nio#3494 merges. @kkebo Please confirm this works. After both of our PR's merge, swift-log and swift-nio will have the same implementation as far as FreeBSD is concerned. - Brought the following recent changes from swift-nio over to swift-log: - apple/swift-nio#3482 - apple/swift-nio#3480 - apple/swift-nio#3483 - Removed stale `// SRWLOCK does not need to be free'd` comment. ### Result: `Lock` implementation will have the same implementation as swift-nio (assuming apple/swift-nio#3494 merges).
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
2 participants
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.
Motivation:
In reviewing a copy of this file in swift-log, @czechboy0 noticed that the call to
pthread_mutexattr_destroyis missing. Since pthread_mutexattr_t is like allocated on the stack rather than heap on most platforms, this is likely not a memory leak. But for correctness the missing destroy call should be added.This change is the start of a resolution requested in a corresponding Lock rollout in swift-log
Modifications:
pthread_mutexattr_destroyNIOLockto also testLock, as a sanity test.Result:
The new sanity test passes. If there are other ways this change can be realistically verified as safe and proper, please feel free to provide feedback in the PR.