Skip to content

fix(iOS): use per-call ReferencedAssetLoader to prevent concurrent access crash #218

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

Merged
mfazekas merged 2 commits into from
Apr 17, 2026
Merged

fix(iOS): use per-call ReferencedAssetLoader to prevent concurrent access crash #218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3adc017
fix(iOS): use per-call ReferencedAssetLoader to prevent concurrent ac…
mfazekas Apr 17, 2026
5099694
Merge branch 'main' into fix/ios-rivefile-concurrent-access-crash
mfazekas Apr 17, 2026
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
10 changes: 6 additions & 4 deletions ios/HybridRiveFileFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import NitroModules
import RiveRuntime

final class HybridRiveFileFactory: HybridRiveFileFactorySpec, @unchecked Sendable {
let assetLoader = ReferencedAssetLoader()

/// Asynchronously creates a `HybridRiveFileSpec` by performing the following steps:
/// 1. Executes `check()` to validate or fetch initial data.
Expand Down Expand Up @@ -34,9 +33,10 @@ final class HybridRiveFileFactory: HybridRiveFileFactorySpec, @unchecked Sendabl
DispatchQueue.global(qos: .userInitiated).async {
do {

let assetLoader = ReferencedAssetLoader()
let referencedAssetCache = SendableRef(ReferencedAssetCache())
let factoryCache: SendableRef<RiveFactory?> = .init(nil)
let customLoader = self.assetLoader.createCustomLoader(
let customLoader = assetLoader.createCustomLoader(
referencedAssets: referencedAssets, cache: referencedAssetCache,
factory: factoryCache
)
Expand All @@ -47,11 +47,13 @@ final class HybridRiveFileFactory: HybridRiveFileFactorySpec, @unchecked Sendabl
} else {
try file(prepared)
}
self.assetLoader.setFileRef(riveFile)
if customLoader != nil {
assetLoader.setFileRef(riveFile)
}

let result = (
file: riveFile, cache: referencedAssetCache.value, factory: factoryCache.value,
loader: customLoader != nil ? self.assetLoader : nil
loader: customLoader != nil ? assetLoader : nil
)
DispatchQueue.main.async {
continuation.resume(returning: result)
Expand Down
Loading