GitHub/paho.mqtt-sn.embedded-c
1
0
Fork 0
mirror of https://github.com/eclipse/paho.mqtt-sn.embedded-c.git synced 2025-12-13 23:46:51 +01:00
Code Issues Projects Releases Wiki Activity

BugFix: avoid terminate called without an active exception error.

Browse Source 
Signed-off-by: tomoaki <tomoaki@tomy-tech.com>
This commit is contained in:
tomoaki
2016-10-19 08:49:09 +09:00
parent b87c8412f8
commit 143b2ef90b
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
MQTTSNGateway/src/linux/Network.cpp
View File

@@ -283,7 +283,7 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
if (!_secureFlg) if (!_secureFlg)
{ {
WRITELOG("TLS is not required.\n"); WRITELOG("TLS is not required.\n");
throw; throw false;
} }
if (_ctx == 0) if (_ctx == 0)
@@ -295,14 +295,14 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
{ {
ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg)); ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg));
WRITELOG("SSL_CTX_new() %s\n", errmsg); WRITELOG("SSL_CTX_new() %s\n", errmsg);
throw; throw false;
} }
if (!SSL_CTX_load_verify_locations(_ctx, caFile, caPath)) if (!SSL_CTX_load_verify_locations(_ctx, caFile, caPath))
{ {
ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg)); ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg));
WRITELOG("SSL_CTX_load_verify_locations() %s\n", errmsg); WRITELOG("SSL_CTX_load_verify_locations() %s\n", errmsg);
throw; throw false;
} }
if ( certkey ) if ( certkey )
@@ -311,7 +311,7 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
{ {
ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg)); ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg));
WRITELOG("SSL_CTX_use_certificate_file() %s %s\n", certkey, errmsg); WRITELOG("SSL_CTX_use_certificate_file() %s %s\n", certkey, errmsg);
throw; throw false;
} }
} }
if ( prvkey ) if ( prvkey )
@@ -320,7 +320,7 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
{ {
ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg)); ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg));
WRITELOG("SSL_use_PrivateKey_file() %s %s\n", prvkey, errmsg); WRITELOG("SSL_use_PrivateKey_file() %s %s\n", prvkey, errmsg);
throw; throw false;
} }
} }
} }
@@ -329,7 +329,7 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
{ {
if ( !TCPStack::connect(host, port) ) if ( !TCPStack::connect(host, port) )
{ {
throw; throw false;
} }
} }
@@ -338,7 +338,7 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
{ {
ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg)); ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg));
WRITELOG("SSL_new() %s\n", errmsg); WRITELOG("SSL_new() %s\n", errmsg);
throw; throw false;
} }
if (!SSL_set_fd(_ssl, TCPStack::getSock())) if (!SSL_set_fd(_ssl, TCPStack::getSock()))
@@ -347,7 +347,7 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
WRITELOG("SSL_set_fd() %s\n", errmsg); WRITELOG("SSL_set_fd() %s\n", errmsg);
SSL_free(_ssl); SSL_free(_ssl);
_ssl = 0; _ssl = 0;
throw; throw false;
} }
if (_session) if (_session)
@@ -361,7 +361,7 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
WRITELOG("SSL_connect() %s\n", errmsg); WRITELOG("SSL_connect() %s\n", errmsg);
SSL_free(_ssl); SSL_free(_ssl);
_ssl = 0; _ssl = 0;
throw; throw false;
} }
int result; int result;
@@ -370,7 +370,7 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
WRITELOG("SSL_get_verify_result() error: %s.\n", X509_verify_cert_error_string(result)); WRITELOG("SSL_get_verify_result() error: %s.\n", X509_verify_cert_error_string(result));
SSL_free(_ssl); SSL_free(_ssl);
_ssl = 0; _ssl = 0;
throw; throw false;
} }
X509* peer = SSL_get_peer_certificate(_ssl); X509* peer = SSL_get_peer_certificate(_ssl);
@@ -386,7 +386,7 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
WRITELOG("SSL_get_peer_certificate() error: Broker %s dosen't match the host name %s\n", peer_CN, host); WRITELOG("SSL_get_peer_certificate() error: Broker %s dosen't match the host name %s\n", peer_CN, host);
SSL_free(_ssl); SSL_free(_ssl);
_ssl = 0; _ssl = 0;
throw; throw false;
} }
if (_session == 0) if (_session == 0)
@@ -397,9 +397,9 @@ bool Network::connect(const char* host, const char* port, const char* caPath, co
_sslValid = true; _sslValid = true;
rc = true; rc = true;
} }
catch (...) catch (bool x)
{ {
rc = false; rc = x;
} }
_mutex.unlock(); _mutex.unlock();
return rc; return rc;