mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #4295: Game crash if the syntax of users.json file is wong 

JsonException was not being caught in NetworkUser::Load().
This commit is contained in:
Ted John 2016-08-16 21:24:03 +01:00
parent 3f9c5456d4
commit 560957824a
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/NetworkUser.cpp
View File

@ -18,6 +18,7 @@
#include <unordered_set>
#include "../core/Console.hpp"
#include "../core/Json.hpp"
#include "../core/Path.hpp"
#include "../core/String.hpp"
@ -94,18 +95,25 @@ void NetworkUserManager::Load()
{
DisposeUsers();
json_t * jsonUsers = Json::ReadFromFile(path);
size_t numUsers = json_array_size(jsonUsers);
for (size_t i = 0; i < numUsers; i++)
try
{
json_t * jsonUser = json_array_get(jsonUsers, i);
NetworkUser * networkUser = NetworkUser::FromJson(jsonUser);
if (networkUser != nullptr)
json_t * jsonUsers = Json::ReadFromFile(path);
size_t numUsers = json_array_size(jsonUsers);
for (size_t i = 0; i < numUsers; i++)
{
_usersByHash[networkUser->Hash] = networkUser;
json_t * jsonUser = json_array_get(jsonUsers, i);
NetworkUser * networkUser = NetworkUser::FromJson(jsonUser);
if (networkUser != nullptr)
{
_usersByHash[networkUser->Hash] = networkUser;
}
}
json_decref(jsonUsers);
}
catch (Exception ex)
{
Console::Error::WriteLine("Failed to read %s as JSON. %s", path, ex.GetMsg());
}
json_decref(jsonUsers);
}
}