diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2016-11-30 15:21:33 -0800 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2016-11-30 15:21:33 -0800 |
| commit | 4b3a47849d2c0d9d473602670318b54aaf65e056 (patch) | |
| tree | fb9fb8d128cbc96841b38f92a2b69518d81984b9 /node | |
| parent | 56faf774ffc3d9d84831b17cf63b59c9224adea2 (diff) | |
| parent | fa2bb91ae5515ef18ed662896b83d654d659e9f1 (diff) | |
| download | infinitytier-4b3a47849d2c0d9d473602670318b54aaf65e056.tar.gz infinitytier-4b3a47849d2c0d9d473602670318b54aaf65e056.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'node')
| -rw-r--r-- | node/Topology.cpp | 5 | ||||
| -rw-r--r-- | node/Utils.cpp | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/node/Topology.cpp b/node/Topology.cpp index 5aafc439..517934fb 100644 --- a/node/Topology.cpp +++ b/node/Topology.cpp @@ -128,10 +128,7 @@ SharedPtr<Peer> Topology::getPeer(const Address &zta) return ap; } } - } catch ( ... ) { - fprintf(stderr,"EXCEPTION in getPeer() part 2\n"); - abort(); - } // invalid identity on disk? + } catch ( ... ) {} // invalid identity on disk? return SharedPtr<Peer>(); } diff --git a/node/Utils.cpp b/node/Utils.cpp index 215e3b3e..06b726cc 100644 --- a/node/Utils.cpp +++ b/node/Utils.cpp @@ -248,7 +248,6 @@ unsigned int Utils::snprintf(char *buf,unsigned int len,const char *fmt,...) if ((n >= (int)len)||(n < 0)) { if (len) buf[len - 1] = (char)0; - abort(); throw std::length_error("buf[] overflow in Utils::snprintf"); } |