Skip to content

fix(P76): guard GLTF instantiation from asset bundle #9402

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

Closed
eordano wants to merge 1 commit into from
+15 −4
Closed

fix(P76): guard GLTF instantiation from asset bundle #9402

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
19 changes: 15 additions & 4 deletions ...rastructure/ECS/Unity/GLTFContainer/Asset/Systems/CreateGltfAssetFromAssetBundleSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,21 @@ private void ConvertFromAssetBundle(in Entity entity, ref GetGltfContainerAssetI

AssetBundleData assetBundleData = assetBundleResult.Asset!;

if (Utils.TryCreateGltfObject(assetBundleData, assetIntention.Hash, out GltfContainerAsset result))
World.Add(entity, new StreamableLoadingResult<GltfContainerAsset>(result));
else
World.Add(entity, new StreamableLoadingResult<GltfContainerAsset>(GetReportData(), new ArgumentException($"Failed to load {assetIntention.Hash} from AB")));
// Instantiation can throw if the AB's underlying Unity asset was destroyed/unloaded
// (ref-counted bundle evicted) leaving a "fake-null" object that TryGetAsset still returns.
// Convert to a failed result instead of letting it escape Update as an EcsSystemException
// (UNITY-EXPLORER-P76 — top crash, 4911 evts/68 users). Mirrors the else-branch failure path.
try
{
if (Utils.TryCreateGltfObject(assetBundleData, assetIntention.Hash, out GltfContainerAsset result))
World.Add(entity, new StreamableLoadingResult<GltfContainerAsset>(result));
else
World.Add(entity, new StreamableLoadingResult<GltfContainerAsset>(GetReportData(), new ArgumentException($"Failed to load {assetIntention.Hash} from AB")));
}
catch (Exception e)
{
World.Add(entity, new StreamableLoadingResult<GltfContainerAsset>(GetReportData(), new ArgumentException($"Failed to instantiate {assetIntention.Hash} from AB", e)));
}

}

Expand Down
Loading