ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-28 15:02:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add mitigations against borked ARM32 exception unrollers, possibly fix GitHub issue #1003

Browse Source
This commit is contained in:
Adam Ierymenko 2019-09-04 12:48:28 -07:00
parent ef69f1bb27
commit a16377cea5
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
service/OneService.cpp
View File

@ -1353,8 +1353,8 @@ public:
if (j.is_object()) { if (j.is_object()) {
seed = Utils::hexStrToU64(OSUtils::jsonString(j["seed"],"0").c_str()); seed = Utils::hexStrToU64(OSUtils::jsonString(j["seed"],"0").c_str());
} }
} catch (std::exception &exc) {
} catch ( ... ) { } catch ( ... ) {
// discard invalid JSON
} }
std::vector<World> moons(_node->moons()); std::vector<World> moons(_node->moons());
@ -1403,8 +1403,8 @@ public:
json &allowDefault = j["allowDefault"]; json &allowDefault = j["allowDefault"];
if (allowDefault.is_boolean()) localSettings.allowDefault = (bool)allowDefault; if (allowDefault.is_boolean()) localSettings.allowDefault = (bool)allowDefault;
} }
} catch (std::exception &exc) {
} catch ( ... ) { } catch ( ... ) {
// discard invalid JSON
} }
setNetworkSettings(nws->networks[i].nwid,localSettings); setNetworkSettings(nws->networks[i].nwid,localSettings);
@ -2035,6 +2035,8 @@ public:
return; return;
} }
} catch (std::exception &exc) {
_phy.close(sock);
} catch ( ... ) { } catch ( ... ) {
_phy.close(sock); _phy.close(sock);
} }
@ -2143,6 +2145,10 @@ public:
#endif #endif
_nets.erase(nwid); _nets.erase(nwid);
return -999; return -999;
} catch (std::exception &exc) {
return -999;
} catch (int exc) {
return -999;
} catch ( ... ) { } catch ( ... ) {
return -999; // tap init failed return -999; // tap init failed
} }