More tracing stuff.

1 files changed, 23 insertions, 9 deletions

diff --git a/node/Identity.cpp b/node/Identity.cpp
index dba27d1c..a972d60d 100644
--- a/node/Identity.cpp
+++ b/node/Identity.cpp
@@ -157,44 +157,58 @@ char *Identity::toString(bool includePrivate,char buf[ZT_IDENTITY_STRING_BUFFER_
 
 bool Identity::fromString(const char *str)
 {
-	if (!str)
+	if (!str) {
+		_address.zero();
 		return false;
-
-	char *saveptr = (char *)0;
+	}
 	char tmp[ZT_IDENTITY_STRING_BUFFER_LENGTH];
-	if (!Utils::scopy(tmp,sizeof(tmp),str))
+	if (!Utils::scopy(tmp,sizeof(tmp),str)) {
+		_address.zero();
 		return false;
+	}
 
 	delete _privateKey;
 	_privateKey = (C25519::Private *)0;
 
 	int fno = 0;
+	char *saveptr = (char *)0;
 	for(char *f=Utils::stok(tmp,":",&saveptr);(f);f=Utils::stok((char *)0,":",&saveptr)) {
 		switch(fno++) {
 			case 0:
 				_address = Address(Utils::hexStrToU64(f));
-				if (_address.isReserved())
+				if (_address.isReserved()) {
+					_address.zero();
 					return false;
+				}
 				break;
 			case 1:
-				if ((f[0] != '0')||(f[1]))
+				if ((f[0] != '0')||(f[1])) {
+					_address.zero();
 					return false;
+				}
 				break;
 			case 2:
-				if (Utils::unhex(f,_publicKey.data,(unsigned int)_publicKey.size()) != _publicKey.size())
+				if (Utils::unhex(f,_publicKey.data,(unsigned int)_publicKey.size()) != _publicKey.size()) {
+					_address.zero();
 					return false;
+				}
 				break;
 			case 3:
 				_privateKey = new C25519::Private();
-				if (Utils::unhex(f,_privateKey->data,(unsigned int)_privateKey->size()) != _privateKey->size())
+				if (Utils::unhex(f,_privateKey->data,(unsigned int)_privateKey->size()) != _privateKey->size()) {
+					_address.zero();
 					return false;
+				}
 				break;
 			default:
+				_address.zero();
 				return false;
 		}
 	}
-	if (fno < 3)
+	if (fno < 3) {
+		_address.zero();
 		return false;
+	}
 
 	return true;
 }