Skip to content

Fix use-after-free crash in audio synthesis on level reset (#133) #197

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
KiritoDv merged 1 commit into from
May 30, 2026
Merged

Fix use-after-free crash in audio synthesis on level reset (#133) #197

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions src/audio/external.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2622,7 +2622,11 @@ void play_toads_jingle(void) {
/**
* Called from threads: thread5_game_loop
*/
void GameEngine_LockAudioThread(void);
void GameEngine_UnlockAudioThread(void);

void sound_reset(u8 presetId) {
GameEngine_LockAudioThread();
#ifndef VERSION_JP
if (presetId >= 8) {
presetId = 0;
Expand Down Expand Up @@ -2651,6 +2655,7 @@ void sound_reset(u8 presetId) {
D_80332108 = (D_80332108 & 0xf0) + presetId;
gSoundMode = D_80332108 >> 4;
sHasStartedFadeOut = FALSE;
GameEngine_UnlockAudioThread();
}

/**
Expand Down
8 changes: 8 additions & 0 deletions src/port/Engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,6 +1182,14 @@ void GameEngine::EndAudioFrame() {
}
}

extern "C" void GameEngine_LockAudioThread() {
audio.mutex.lock();
}

extern "C" void GameEngine_UnlockAudioThread() {
audio.mutex.unlock();
}

void GameEngine::AudioInit() {
const auto resourceMgr = Ship::Context::GetInstance()->GetResourceManager();
resourceMgr->LoadResources("sound");
Expand Down
Loading