mirror/fallout2-ce
1
0
Fork 0
mirror of https://github.com/alexbatalov/fallout2-ce.git synced 2025-02-23 15:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Copy sound string because dictionary can re-allocate it (#436)

Browse Source 
Co-authored-by: Alexander Batalov <alex.batalov@gmail.com>
This commit is contained in:
Vasilii Rogin 2025-01-12 22:59:34 +02:00 committed by GitHub
parent 0a9aaab4d1
commit 939211d640
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/game_sound.cc
View File

@ -107,10 +107,10 @@ static int _background_loop_requested = -1;
static char* _sound_sfx_path = _aSoundSfx; static char* _sound_sfx_path = _aSoundSfx;
// 0x518E78 // 0x518E78
static char* _sound_music_path1 = _aSoundMusic_0; static char* _sound_music_path1 = nullptr;
// 0x518E7C // 0x518E7C
static char* _sound_music_path2 = _aSoundMusic_0; static char* _sound_music_path2 = nullptr;
// 0x518E80 // 0x518E80
static char* _sound_speech_path = _aSoundSpeech_0; static char* _sound_speech_path = _aSoundSpeech_0;
@ -391,6 +391,9 @@ int gameSoundExit()
audioFileExit(); audioFileExit();
audioExit(); audioExit();
internal_free(_sound_music_path1);
internal_free(_sound_music_path2);
gGameSoundInitialized = false; gGameSoundInitialized = false;
return 0; return 0;
@ -1957,12 +1960,15 @@ int _gsound_get_music_path(char** out_value, const char* key)
char* copy; char* copy;
char* value; char* value;
configGetString(&gGameConfig, GAME_CONFIG_SOUND_KEY, key, out_value); if (!configGetString(&gGameConfig, GAME_CONFIG_SOUND_KEY, key, &value)) {
*out_value = internal_strdup(_aSoundMusic_0);
return 0;
}
value = *out_value;
len = strlen(value); len = strlen(value);
if (value[len - 1] == '\\' || value[len - 1] == '/') { if (value[len - 1] == '\\' || value[len - 1] == '/') {
*out_value = internal_strdup(value);
return 0; return 0;
} }
@ -1978,7 +1984,9 @@ int _gsound_get_music_path(char** out_value, const char* key)
copy[len] = '\\'; copy[len] = '\\';
copy[len + 1] = '\0'; copy[len + 1] = '\0';
if (configSetString(&gGameConfig, GAME_CONFIG_SOUND_KEY, key, copy) != 1) { if (!configSetString(&gGameConfig, GAME_CONFIG_SOUND_KEY, key, copy)) {
internal_free(copy);
if (gGameSoundDebugEnabled) { if (gGameSoundDebugEnabled) {
debugPrint("config_set_string failed in gsound_music_path.\n"); debugPrint("config_set_string failed in gsound_music_path.\n");
} }
@ -1986,16 +1994,20 @@ int _gsound_get_music_path(char** out_value, const char* key)
return -1; return -1;
} }
if (configGetString(&gGameConfig, GAME_CONFIG_SOUND_KEY, key, out_value)) { if (!configGetString(&gGameConfig, GAME_CONFIG_SOUND_KEY, key, &value)) {
internal_free(copy); internal_free(copy);
return 0;
if (gGameSoundDebugEnabled) {
debugPrint("config_get_string failed in gsound_music_path.\n");
}
return -1;
} }
if (gGameSoundDebugEnabled) { internal_free(copy);
debugPrint("config_get_string failed in gsound_music_path.\n");
}
return -1; *out_value = internal_strdup(value);
return 0;
} }
// 0x452378 // 0x452378