Skip to content

Handle DirectMusic loader creation failures safely #985

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
Solessfir wants to merge 1 commit into from
Closed

Handle DirectMusic loader creation failures safely #985

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
8 changes: 5 additions & 3 deletions common/resources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,10 @@ Resources::Resources(Tempest::Device &device)
DmResult rv = DmLoader_create(&dmLoader, DmLoader_DOWNLOAD);
if(rv != DmResult_SUCCESS) {
Log::e("Failed to created DmLoader object. Out of memory?");
dmLoader = nullptr;

@Try Try Sep 10, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure, It's not intended for library code (DmLoader_create) to change &dmLoader on error.
So, correct way to fix it is to PR into DirectMusic.

}

DmLoader_addResolver(dmLoader, [](void* ctx, char const* name, size_t* len) -> void* {
else {
DmLoader_addResolver(dmLoader, [](void* ctx, char const* name, size_t* len) -> void* {

@Try Try Sep 10, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also not need - DmLoader_* meant to early out and return DmResult_INVALID_ARGUMENT, for null-argument.

auto* slf = reinterpret_cast<Resources*>(ctx);
auto* node = slf->gothicAssets.find(name);

Expand All @@ -118,7 +119,8 @@ Resources::Resources(Tempest::Device &device)
reader->read(bytes, *len);

return bytes;
}, this);
}, this);
}
}

void Resources::mountWork(const std::filesystem::path& path) {
Expand Down