Skip to content
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.

Sign up for GitHub

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

Fix crash dereferencing unowned _publisher in KVO trampoline #112

Merged
merged 4 commits into from
Aug 16, 2024
Merged

Fix crash dereferencing unowned _publisher in KVO trampoline #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29cd759
Fix crash dereferencing unowned _publisher in KVO trampoline
nolanw Aug 16, 2024
6bc7a80
Update change log
nolanw Aug 16, 2024
4865e0b
More clearly capture `publisher` in the ObserverTrampoline closure wi…
nolanw Aug 16, 2024
66ee557
Update CHANGELOG.md
jessesquires Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ NEXT

- TBA

5.1.2
-----

- Fixed possible crash when receiving a KVO notification and so attempting to send a value to `FoilDefaultStorage` or `FoilDefaultStorageOptional`'s publisher after the storage is deallocated. ([#112](https://github.com/jessesquires/Foil/issues/112), [@nolanw](https://github.com/nolanw))

5.1.1
-----

Expand Down
7 changes: 4 additions & 3 deletions Sources/FoilDefaultStorage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ public struct FoilDefaultStorage<T: UserDefaultsSerializable> {
// Publisher must be initialized after `registerDefault`,
// because `fetch` assumes that `registerDefault` has been called before
// and uses force unwrap
self._publisher = CurrentValueSubject<T, Never>(userDefaults.fetch(keyName))
let publisher = CurrentValueSubject<T, Never>(userDefaults.fetch(keyName))
self._publisher = publisher

self._observer = ObserverTrampoline(userDefaults: userDefaults, key: keyName) { [unowned _publisher] in
_publisher.send(userDefaults.fetch(keyName))
self._observer = ObserverTrampoline(userDefaults: userDefaults, key: keyName) {
publisher.send(userDefaults.fetch(keyName))
}
}
}
7 changes: 4 additions & 3 deletions Sources/FoilDefaultStorageOptional.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@ public struct FoilDefaultStorageOptional<T: UserDefaultsSerializable> {
public init(key keyName: String, userDefaults: UserDefaults = .standard) {
self.key = keyName
self._userDefaults = userDefaults
self._publisher = CurrentValueSubject<T?, Never>(userDefaults.fetchOptional(keyName))
self._observer = ObserverTrampoline(userDefaults: userDefaults, key: keyName) { [unowned _publisher] in
_publisher.send(userDefaults.fetchOptional(keyName))
let publisher = CurrentValueSubject<T?, Never>(userDefaults.fetchOptional(keyName))
self._publisher = publisher
self._observer = ObserverTrampoline(userDefaults: userDefaults, key: keyName) {
publisher.send(userDefaults.fetchOptional(keyName))
}
}
}
Loading