Merge pull request #4459

bcf3f6af fuzz_tests: catch unhandled exceptions (moneromooo-monero)
3ebd05d4 miner: restore stream flags after changing them (moneromooo-monero)
a093092e levin_protocol_handler_async: do not propagate exception through dtor (moneromooo-monero)
1eebb82b net_helper: do not propagate exceptions through dtor (moneromooo-monero)
fb6a3630 miner: do not propagate exceptions through dtor (moneromooo-monero)
2e2139ff epee: do not propagate exception through dtor (moneromooo-monero)
0749a8bd db_lmdb: do not propagate exceptions in dtor (moneromooo-monero)
1b0afeeb wallet_rpc_server: exit cleanly on unhandled exceptions (moneromooo-monero)
418a9936 unit_tests: catch unhandled exceptions (moneromooo-monero)
ea7f9543 threadpool: do not propagate exceptions through the dtor (moneromooo-monero)
6e855422 gen_multisig: nice exit on unhandled exception (moneromooo-monero)
53df2deb db_lmdb: catch error in mdb_stat calls during migration (moneromooo-monero)
e67016dd blockchain_blackball: catch failure to commit db transaction (moneromooo-monero)
661439f4 mlog: don't remove old logs if we failed to rename the current file (moneromooo-monero)
5fdcda50 easylogging++: test for NULL before dereference (moneromooo-monero)
7ece1550 performance_test: fix bad last argument calling add_arg (moneromooo-monero)
a085da32 unit_tests: add check for page size > 0 before dividing (moneromooo-monero)
d8b1ec8b unit_tests: use std::shared_ptr to shut coverity up about leaks (moneromooo-monero)
02563bf4 simplewallet: top level exception catcher to print nicer messages (moneromooo-monero)
c57a65b2 blockchain_blackball: fix shift range for 32 bit archs (moneromooo-monero)

4 files changed, 47 insertions, 38 deletions

diff --git a/tests/fuzz/fuzzer.cpp b/tests/fuzz/fuzzer.cpp
index 032ff049a..ab14e2b79 100644
--- a/tests/fuzz/fuzzer.cpp
+++ b/tests/fuzz/fuzzer.cpp
@@ -46,6 +46,8 @@ static int __AFL_LOOP(int)
 
 int run_fuzzer(int argc, const char **argv, Fuzzer &fuzzer)
 {
+  TRY_ENTRY();
+
   if (argc < 2)
   {
     std::cout << "usage: " << argv[0] << " " << "<filename>" << std::endl;
@@ -69,4 +71,6 @@ int run_fuzzer(int argc, const char **argv, Fuzzer &fuzzer)
   }
 
   return 0;
+
+  CATCH_ENTRY_L0("run_fuzzer", 1);
 }
diff --git a/tests/performance_tests/main.cpp b/tests/performance_tests/main.cpp
index 7c5135c65..87a1573c2 100644
--- a/tests/performance_tests/main.cpp
+++ b/tests/performance_tests/main.cpp
@@ -75,10 +75,10 @@ int main(int argc, char** argv)
   const command_line::arg_descriptor<bool> arg_verbose = { "verbose", "Verbose output", false };
   const command_line::arg_descriptor<bool> arg_stats = { "stats", "Including statistics (min/median)", false };
   const command_line::arg_descriptor<unsigned> arg_loop_multiplier = { "loop-multiplier", "Run for that many times more loops", 1 };
-  command_line::add_arg(desc_options, arg_filter, "");
-  command_line::add_arg(desc_options, arg_verbose, "");
-  command_line::add_arg(desc_options, arg_stats, "");
-  command_line::add_arg(desc_options, arg_loop_multiplier, "");
+  command_line::add_arg(desc_options, arg_filter);
+  command_line::add_arg(desc_options, arg_verbose);
+  command_line::add_arg(desc_options, arg_stats);
+  command_line::add_arg(desc_options, arg_loop_multiplier);
 
   po::variables_map vm;
   bool r = command_line::handle_error_helper(desc_options, [&]()
diff --git a/tests/unit_tests/main.cpp b/tests/unit_tests/main.cpp
index 13b62cbb4..f7251a09e 100644
--- a/tests/unit_tests/main.cpp
+++ b/tests/unit_tests/main.cpp
@@ -53,6 +53,8 @@ namespace cryptonote { template class t_cryptonote_protocol_handler<cryptonote::
 
 int main(int argc, char** argv)
 {
+  TRY_ENTRY();
+
   tools::on_startup();
   epee::string_tools::set_module_name_and_folder(argv[0]);
   mlog_configure(mlog_get_default_log_path("unit_tests.log"), true);
@@ -76,5 +78,7 @@ int main(int argc, char** argv)
 
   unit_test::data_dir = command_line::get_arg(vm, arg_data_dir);
 
+  CATCH_ENTRY_L0("main", 1);
+
   return RUN_ALL_TESTS();
 }
diff --git a/tests/unit_tests/mlocker.cpp b/tests/unit_tests/mlocker.cpp
index 480940374..c97dc2c1d 100644
--- a/tests/unit_tests/mlocker.cpp
+++ b/tests/unit_tests/mlocker.cpp
@@ -46,14 +46,14 @@ TEST(mlocker, distinct_1)
   const size_t base_pages = epee::mlocker::get_num_locked_pages();
   const size_t base_objects = epee::mlocker::get_num_locked_objects();
   std::unique_ptr<char[]> data{new char[8 * page_size]};
-  epee::mlocker *m0 = new epee::mlocker(BASE(data), 1);
-  epee::mlocker *m1 = new epee::mlocker(BASE(data) + 2 * page_size, 1);
-  epee::mlocker *m2 = new epee::mlocker(BASE(data) + 3 * page_size, 1);
+  std::shared_ptr<epee::mlocker> m0{new epee::mlocker(BASE(data), 1)};
+  std::shared_ptr<epee::mlocker> m1{new epee::mlocker(BASE(data) + 2 * page_size, 1)};
+  std::shared_ptr<epee::mlocker> m2{new epee::mlocker(BASE(data) + 3 * page_size, 1)};
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 3);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 3);
-  delete m0;
-  delete m1;
-  delete m2;
+  m0 = NULL;
+  m1 = NULL;
+  m2 = NULL;
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 0);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 0);
 }
@@ -65,14 +65,14 @@ TEST(mlocker, distinct_full_page)
   const size_t base_pages = epee::mlocker::get_num_locked_pages();
   const size_t base_objects = epee::mlocker::get_num_locked_objects();
   std::unique_ptr<char[]> data{new char[8 * page_size]};
-  epee::mlocker *m0 = new epee::mlocker(BASE(data), page_size);
-  epee::mlocker *m1 = new epee::mlocker(BASE(data) + 2 * page_size, page_size);
-  epee::mlocker *m2 = new epee::mlocker(BASE(data) + 3 * page_size, page_size);
+  std::shared_ptr<epee::mlocker> m0{new epee::mlocker(BASE(data), page_size)};
+  std::shared_ptr<epee::mlocker> m1{new epee::mlocker(BASE(data) + 2 * page_size, page_size)};
+  std::shared_ptr<epee::mlocker> m2{new epee::mlocker(BASE(data) + 3 * page_size, page_size)};
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 3);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 3);
-  delete m0;
-  delete m1;
-  delete m2;
+  m0 = NULL;
+  m1 = NULL;
+  m2 = NULL;
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 0);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 0);
 }
@@ -84,16 +84,16 @@ TEST(mlocker, identical)
   const size_t base_pages = epee::mlocker::get_num_locked_pages();
   const size_t base_objects = epee::mlocker::get_num_locked_objects();
   std::unique_ptr<char[]> data{new char[8 * page_size]};
-  epee::mlocker *m0 = new epee::mlocker(BASE(data) + page_size, 32);
-  epee::mlocker *m1 = new epee::mlocker(BASE(data) + page_size, 32);
-  epee::mlocker *m2 = new epee::mlocker(BASE(data) + page_size, 32);
+  std::shared_ptr<epee::mlocker> m0{new epee::mlocker(BASE(data) + page_size, 32)};
+  std::shared_ptr<epee::mlocker> m1{new epee::mlocker(BASE(data) + page_size, 32)};
+  std::shared_ptr<epee::mlocker> m2{new epee::mlocker(BASE(data) + page_size, 32)};
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 1);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 3);
-  delete m1;
+  m1 = NULL;
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 1);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 2);
-  delete m0;
-  delete m2;
+  m0 = NULL;
+  m2 = NULL;
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 0);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 0);
 }
@@ -105,16 +105,16 @@ TEST(mlocker, overlapping_small)
   const size_t base_pages = epee::mlocker::get_num_locked_pages();
   const size_t base_objects = epee::mlocker::get_num_locked_objects();
   std::unique_ptr<char[]> data{new char[8 * page_size]};
-  epee::mlocker *m0 = new epee::mlocker(BASE(data), 32);
-  epee::mlocker *m1 = new epee::mlocker(BASE(data) + 16, 32);
-  epee::mlocker *m2 = new epee::mlocker(BASE(data) + 8, 32);
+  std::shared_ptr<epee::mlocker> m0{new epee::mlocker(BASE(data), 32)};
+  std::shared_ptr<epee::mlocker> m1{new epee::mlocker(BASE(data) + 16, 32)};
+  std::shared_ptr<epee::mlocker> m2{new epee::mlocker(BASE(data) + 8, 32)};
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 1);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 3);
-  delete m1;
+  m1 = NULL;
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 1);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 2);
-  delete m2;
-  delete m0;
+  m2 = NULL;
+  m0 = NULL;
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 0);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 0);
 }
@@ -126,16 +126,16 @@ TEST(mlocker, multi_page)
   const size_t base_pages = epee::mlocker::get_num_locked_pages();
   const size_t base_objects = epee::mlocker::get_num_locked_objects();
   std::unique_ptr<char[]> data{new char[8 * page_size]};
-  epee::mlocker *m0 = new epee::mlocker(BASE(data) + page_size, page_size * 3);
+  std::shared_ptr<epee::mlocker> m0{new epee::mlocker(BASE(data) + page_size, page_size * 3)};
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 3);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 1);
-  epee::mlocker *m1 = new epee::mlocker(BASE(data) + page_size * 7, page_size);
+  std::shared_ptr<epee::mlocker> m1{new epee::mlocker(BASE(data) + page_size * 7, page_size)};
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 4);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 2);
-  delete m0;
+  m0 = NULL;
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 1);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 1);
-  delete m1;
+  m1 = NULL;
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 0);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 0);
 }
@@ -147,10 +147,10 @@ TEST(mlocker, cross_page)
   const size_t base_pages = epee::mlocker::get_num_locked_pages();
   const size_t base_objects = epee::mlocker::get_num_locked_objects();
   std::unique_ptr<char[]> data{new char[2 * page_size]};
-  epee::mlocker *m0 = new epee::mlocker(BASE(data) + page_size - 1, 2);
+  std::shared_ptr<epee::mlocker> m0{new epee::mlocker(BASE(data) + page_size - 1, 2)};
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 2);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 1);
-  delete m0;
+  m0 = NULL;
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 0);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 0);
 }
@@ -158,21 +158,22 @@ TEST(mlocker, cross_page)
 TEST(mlocker, redundant)
 {
   const size_t page_size = epee::mlocker::get_page_size();
+  ASSERT_TRUE(page_size > 0);
   const size_t base_pages = epee::mlocker::get_num_locked_pages();
   const size_t base_objects = epee::mlocker::get_num_locked_objects();
   std::unique_ptr<char[]> data{new char[2 * page_size]};
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 0);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 0);
-  epee::mlocker *m0 = new epee::mlocker(BASE(data), 32);
+  std::shared_ptr<epee::mlocker> m0{new epee::mlocker(BASE(data), 32)};
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 1);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 1);
-  epee::mlocker *m1 = new epee::mlocker(BASE(data), 32);
+  std::shared_ptr<epee::mlocker> m1{new epee::mlocker(BASE(data), 32)};
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 1);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 2);
-  delete m1;
+  m1 = NULL;
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 1);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 1);
-  delete m0;
+  m0 = NULL;
   ASSERT_EQ(epee::mlocker::get_num_locked_pages(), base_pages + 0);
   ASSERT_EQ(epee::mlocker::get_num_locked_objects(), base_objects + 0);
 }