dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid nullptr reference undefined behaviour in saveload when discarding table string on load

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-06-20 00:09:19 +01:00
parent 88b298f30e
commit 6244f5b929
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sl/saveload.cpp
View File

@@ -1254,10 +1254,13 @@ static void SlString(void *ptr, size_t length, VarType conv)
* @param ptr the string being manipulated
* @param conv must be SLE_FILE_STRING
*/
void SlStdString(std::string &str, VarType conv)
void SlStdString(std::string *ptr, VarType conv)
{
switch (_sl.action) {
case SLA_SAVE: {
dbg_assert(ptr != nullptr);
std::string &str = *ptr;
SlWriteArrayLength(str.size());
SlCopyBytes(str.data(), str.size());
break;
@@ -1270,6 +1273,9 @@ void SlStdString(std::string &str, VarType conv)
return;
}
dbg_assert(ptr != nullptr);
std::string &str = *ptr;
str.resize(len);
SlCopyBytes(str.data(), len);
@@ -1992,7 +1998,7 @@ bool SlObjectMemberGeneric(void *object, const SaveLoad &sld)
}
break;
}
case SL_STDSTR: SlStdString(*static_cast<std::string *>(ptr), sld.conv); break;
case SL_STDSTR: SlStdString(static_cast<std::string *>(ptr), sld.conv); break;
default: NOT_REACHED();
}
break;
@@ -2216,7 +2222,7 @@ std::vector<SaveLoad> SlTableHeader(const NamedSaveLoadTable &slt)
}
std::string key;
SlStdString(key, SLE_STR);
SlStdString(&key, SLE_STR);
auto sld_it = std::lower_bound(key_lookup.begin(), key_lookup.end(), key);
if (sld_it == key_lookup.end() || sld_it->name != key) {