void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix handling of invalid conf file

Browse source 
Fixes GitHub issue #1068
This commit is contained in:
Grant Limberg 2019-12-17 10:51:01 -08:00
parent 2a7d4fcde5
commit 7696d45093
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
windows/WinUI/CentralAPI.cs
View file

@ -75,7 +75,15 @@ namespace WinUI
{ {
byte[] tmp = File.ReadAllBytes(centralConfigPath); byte[] tmp = File.ReadAllBytes(centralConfigPath);
string json = Encoding.UTF8.GetString(tmp).Trim(); string json = Encoding.UTF8.GetString(tmp).Trim();
Central = JsonConvert.DeserializeObject<CentralServer>(json); CentralServer ctmp = JsonConvert.DeserializeObject<CentralServer>(json);
if (ctmp != null)
{
Central = ctmp;
}
else
{
Central = new CentralServer();
}
} }
else else
{ {
@ -105,7 +113,10 @@ namespace WinUI
{ {
string json = JsonConvert.SerializeObject(Central); string json = JsonConvert.SerializeObject(Central);
byte[] tmp = Encoding.UTF8.GetBytes(json); byte[] tmp = Encoding.UTF8.GetBytes(json);
File.WriteAllBytes(CentralConfigFile(), tmp); if (tmp != null)
{
File.WriteAllBytes(CentralConfigFile(), tmp);
}
} }
private void UpdateRequestHeaders() private void UpdateRequestHeaders()