diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-04-11 13:15:20 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-04-11 13:15:20 +0200 |
| commit | 716f5a2a6ad494303ab134c29e786a4bd4aa01af (patch) | |
| tree | 73cde00653a5e208eaaf04ab1f98fc9b689a761e | |
| parent | Merge pull request #5383 (diff) | |
| parent | block_weight: catch exceptions in main for clean exit on error (diff) | |
| download | monero-716f5a2a6ad494303ab134c29e786a4bd4aa01af.tar.xz | |
Merge pull request #5384
0eee6cd7 block_weight: catch exceptions in main for clean exit on error (moneromooo-monero)
4b3bb829 epee: init a new ssl related variable in ctor (moneromooo-monero)
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.inl | 1 | ||||
| -rw-r--r-- | tests/block_weight/block_weight.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index 58f899a73..14fbec5d9 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/contrib/epee/include/net/abstract_tcp_server2.inl @@ -95,6 +95,7 @@ PRAGMA_WARNING_DISABLE_VS(4355) : connection_basic(std::move(sock), state, ssl_support), m_protocol_handler(this, check_and_get(state).config, context), + buffer_ssl_init_fill(0), m_connection_type( connection_type ), m_throttle_speed_in("speed_in", "throttle_speed_in"), m_throttle_speed_out("speed_out", "throttle_speed_out"), diff --git a/tests/block_weight/block_weight.cpp b/tests/block_weight/block_weight.cpp index 7b3fdfe57..f193133da 100644 --- a/tests/block_weight/block_weight.cpp +++ b/tests/block_weight/block_weight.cpp @@ -195,8 +195,10 @@ static void test(test_t t, uint64_t blocks) int main() { + TRY_ENTRY(); test(test_max, 2 * LONG_TERM_BLOCK_WEIGHT_WINDOW); test(test_lcg, 9 * LONG_TERM_BLOCK_WEIGHT_WINDOW); test(test_min, 1 * LONG_TERM_BLOCK_WEIGHT_WINDOW); return 0; + CATCH_ENTRY_L0("main", 1); } |