etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 12:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix free after use in mod_storage_load

Browse source
This commit is contained in:
Isaac0-dev 2024-03-20 23:06:49 +10:00
parent a022b04638
commit bf23836115
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/pc/mods/mod_storage.cpp
View file

@ -30,7 +30,7 @@ void strdelete(char string[], char substr[]) {
if (strstr(&string[i], substr) == &string[i]) { if (strstr(&string[i], substr) == &string[i]) {
// determine the string's new length after removing the substr occurrence // determine the string's new length after removing the substr occurrence
string_length -= substr_length; string_length -= substr_length;
// shift forward the remaining characters in the string after the substr // shift forward the remaining characters in the string after the substr
// occurrence by the length of substr, effectively removing it! // occurrence by the length of substr, effectively removing it!
for (u16 j = i; j < string_length; j++) { for (u16 j = i; j < string_length; j++) {
string[j] = string[j + substr_length]; string[j] = string[j + substr_length];
@ -112,7 +112,11 @@ C_FIELD const char* mod_storage_load(const char* key) {
mINI::INIStructure ini; mINI::INIStructure ini;
file.read(ini); file.read(ini);
return const_cast<char*>(ini["storage"][key].c_str()); // Store string results in a temporary buffer
// this assumes mod_storage_load will only ever be called by Lua
static char value[MAX_KEY_VALUE_LENGTH];
snprintf(value, MAX_KEY_VALUE_LENGTH, "%s", const_cast<char*>(ini["storage"][key].c_str()));
return value;
} }
C_FIELD double mod_storage_load_number(const char* key) { C_FIELD double mod_storage_load_number(const char* key) {