gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug preventing default from being set to null if already set to an integer.

Browse Source
This commit is contained in:
Adam Ierymenko
2017-03-29 12:32:59 -07:00
parent 3f4f7145a3
commit 57b5a33fbb
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controller/EmbeddedNetworkController.cpp
View File

@@ -1018,9 +1018,10 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
json ntag = json::object(); json ntag = json::object();
const uint64_t tagId = OSUtils::jsonInt(tag["id"],0ULL); const uint64_t tagId = OSUtils::jsonInt(tag["id"],0ULL);
ntag["id"] = tagId; ntag["id"] = tagId;
if (tag.find("default") == tag.end()) json &dfl = tag["default"];
ntag["default"] = json(); if (dfl.is_null())
else ntag["default"] = OSUtils::jsonInt(tag["default"],0ULL); ntag["default"] = dfl;
else ntag["default"] = OSUtils::jsonInt(dfl,0ULL);
ntags[tagId] = ntag; ntags[tagId] = ntag;
} }
} }