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

check for nulls

Browse source
This commit is contained in:
Grant Limberg 2021-06-04 09:20:39 -07:00
parent 2192a8b0ec
commit bc901d613d
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
controller/PostgreSQL.cpp
View file

@ -590,6 +590,13 @@ void PostgreSQL::initializeMembers()
initMember(config); initMember(config);
if (row[0].is_null()) {
fprintf(stderr, "Null memberID?!?\n");
continue;
}
if (row[1].is_null()) {
fprintf(stderr, "Null NetworkID?!?\n");
}
std::string memberId = row[0].as<std::string>(); std::string memberId = row[0].as<std::string>();
std::string networkId = row[1].as<std::string>(); std::string networkId = row[1].as<std::string>();
@ -625,11 +632,19 @@ void PostgreSQL::initializeMembers()
} catch (std::exception &e) { } catch (std::exception &e) {
config["remoteTraceLevel"] = 0; config["remoteTraceLevel"] = 0;
} }
config["remoteTraceTarget"] = row[10].as<std::string>(); if (!config["remoteTraceTarget"].is_null()) {
try { config["remoteTraceTarget"] = row[10].as<std::string>();
config["tags"] = json::parse(row[11].as<std::string>()); } else {
} catch (std::exception &e) { config["remoteTraceTarget"] = "";
}
if (config["tags"].is_null()) {
config["tags"] = json::array(); config["tags"] = json::array();
} else {
try {
config["tags"] = json::parse(row[11].as<std::string>());
} catch (std::exception &e) {
config["tags"] = json::array();
}
} }
try { try {
config["vMajor"] = row[12].as<int>(); config["vMajor"] = row[12].as<int>();