oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Inv deSerialize(): Prevent infinite loop, error on failure (#7711)

Browse source 
Throws an error about potentially damaged player inventories but proceeds converting the rest of them
This commit is contained in:
SmallJoker 2018-09-14 20:29:21 +02:00 • committed by GitHub
parent 81c06dea9b
commit 220ec79e4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/remoteplayer.cpp
View file

@ -139,7 +139,12 @@ void RemotePlayer::deSerialize(std::istream &is, const std::string &playername,
} catch (SettingNotFoundException &e) {}
}
inventory.deSerialize(is);
try {
inventory.deSerialize(is);
} catch (SerializationError &e) {
errorstream << "Failed to deserialize player inventory. player_name="
<< name << " " << e.what() << std::endl;
}
if (!inventory.getList("craftpreview") && inventory.getList("craftresult")) {
// Convert players without craftpreview