From d81549a7b1553f399e6effdf17746242b89d9222 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Mon, 25 Mar 2019 22:19:52 +0000
Subject: Various other fixes including removal of more mem*() issues and
 netlink fixes for AARCH64.

---
 node/Capability.hpp    | 2 ++
 node/NetworkConfig.cpp | 3 ++-
 node/Tag.hpp           | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'node')

diff --git a/node/Capability.hpp b/node/Capability.hpp
index 25787c76..0704c513 100644
--- a/node/Capability.hpp
+++ b/node/Capability.hpp
@@ -79,6 +79,8 @@ public:
 		_maxCustodyChainLength(0),
 		_ruleCount(0)
 	{
+		memset(_rules,0,sizeof(_rules));
+		memset(_custody,0,sizeof(_custody));
 	}
 
 	/**
diff --git a/node/NetworkConfig.cpp b/node/NetworkConfig.cpp
index 8be72008..20ad2e25 100644
--- a/node/NetworkConfig.cpp
+++ b/node/NetworkConfig.cpp
@@ -200,10 +200,11 @@ bool NetworkConfig::toDictionary(Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d,b
 
 bool NetworkConfig::fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d)
 {
+	static const NetworkConfig NIL_NC;
 	Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY> *tmp = new Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY>();
 
 	try {
-		*this = NetworkConfig();
+		*this = NIL_NC;
 
 		// Fields that are always present, new or old
 		this->networkId = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_NETWORK_ID,0);
diff --git a/node/Tag.hpp b/node/Tag.hpp
index ec53f734..3f888ba9 100644
--- a/node/Tag.hpp
+++ b/node/Tag.hpp
@@ -89,6 +89,7 @@ public:
 		_issuedTo(issuedTo),
 		_signedBy()
 	{
+		memset(_signature.data,0,sizeof(_signature.data));
 	}
 
 	inline uint32_t id() const { return _id; }
-- 
cgit v1.2.3