Skip to content

fix: Safer asset catalog reader for liquid glass #2771

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
merged 1 commit into from
Sep 19, 2025
Merged

fix: Safer asset catalog reader for liquid glass #2771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions ...rsing/native/swift/AssetCatalogParser/Sources/AssetCatalogParser/AssetCatalogReader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ enum AssetUtil {
key.perform(Selector(("keyList"))),
to: UnsafeMutableRawPointer.self
)
let rendition = createRendition(from: structuredThemeStore, keyList)
guard let rendition = createRendition(from: structuredThemeStore, keyList) else {
continue
}

let data = rendition.value(forKey: "_srcData") as! Data
let length = UInt(data.count)
Expand Down Expand Up @@ -198,13 +200,13 @@ enum AssetUtil {
}

private static func createRendition(from themeStore: NSObject, _ keyList: UnsafeMutableRawPointer)
-> NSObject
-> NSObject?
{
let renditionWithKeySelector = Selector(("renditionWithKey:"))
let renditionWithKeyMethod = themeStore.method(for: renditionWithKeySelector)!
let renditionWithKeyImp = unsafeBitCast(renditionWithKeyMethod, to: objectiveCMethodImp.self)
return renditionWithKeyImp(themeStore, renditionWithKeySelector, keyList)!.takeUnretainedValue()
as! NSObject
return renditionWithKeyImp(themeStore, renditionWithKeySelector, keyList)?.takeUnretainedValue()
as? NSObject
}

private static func handleReferenceKey(
Expand All @@ -222,7 +224,9 @@ enum AssetUtil {
referenceKey.perform(Selector(("keyList"))),
to: UnsafeMutableRawPointer.self
)
let referenceRendition = createRendition(from: themeStore, referenceKeyList)
guard let referenceRendition = createRendition(from: themeStore, referenceKeyList) else {
return false
}

if let result = referenceRendition.perform(Selector(("unslicedImage"))) {
let image = result.takeUnretainedValue() as! CGImage
Expand Down