fix leaks in fuzz tests

4 files changed, 34 insertions, 17 deletions

diff --git a/tests/fuzz/cold-outputs.cpp b/tests/fuzz/cold-outputs.cpp
index af0a33422..ce6d6640c 100644
--- a/tests/fuzz/cold-outputs.cpp
+++ b/tests/fuzz/cold-outputs.cpp
@@ -34,16 +34,19 @@
 #include "wallet/wallet2.h"
 #include "fuzzer.h"
 
-static tools::wallet2 wallet;
+static tools::wallet2 *wallet = NULL;
 
 BEGIN_INIT_SIMPLE_FUZZER()
+  static tools::wallet2 local_wallet;
+  wallet = &local_wallet;
+
   static const char * const spendkey_hex = "0b4f47697ec99c3de6579304e5f25c68b07afbe55b71d99620bf6cbf4e45a80f";
   crypto::secret_key spendkey;
   epee::string_tools::hex_to_pod(spendkey_hex, spendkey);
 
-  wallet.init("", boost::none, boost::asio::ip::tcp::endpoint{}, 0, true, epee::net_utils::ssl_support_t::e_ssl_support_disabled);
-  wallet.set_subaddress_lookahead(1, 1);
-  wallet.generate("", "", spendkey, true, false);
+  wallet->init("", boost::none, boost::asio::ip::tcp::endpoint{}, 0, true, epee::net_utils::ssl_support_t::e_ssl_support_disabled);
+  wallet->set_subaddress_lookahead(1, 1);
+  wallet->generate("", "", spendkey, true, false);
 END_INIT_SIMPLE_FUZZER()
 
 BEGIN_SIMPLE_FUZZER()
@@ -53,6 +56,6 @@ BEGIN_SIMPLE_FUZZER()
   iss << s;
   boost::archive::portable_binary_iarchive ar(iss);
   ar >> outputs;
-  size_t n_outputs = wallet.import_outputs(outputs);
+  size_t n_outputs = wallet->import_outputs(outputs);
   std::cout << boost::lexical_cast<std::string>(n_outputs) << " outputs imported" << std::endl;
 END_SIMPLE_FUZZER()
diff --git a/tests/fuzz/cold-transaction.cpp b/tests/fuzz/cold-transaction.cpp
index 9808362e4..ebbbc283f 100644
--- a/tests/fuzz/cold-transaction.cpp
+++ b/tests/fuzz/cold-transaction.cpp
@@ -34,16 +34,19 @@
 #include "wallet/wallet2.h"
 #include "fuzzer.h"
 
-static tools::wallet2 wallet;
+static tools::wallet2 *wallet = NULL;
 
 BEGIN_INIT_SIMPLE_FUZZER()
+  static tools::wallet2 local_wallet;
+  wallet = &local_wallet;
+
   static const char * const spendkey_hex = "0b4f47697ec99c3de6579304e5f25c68b07afbe55b71d99620bf6cbf4e45a80f";
   crypto::secret_key spendkey;
   epee::string_tools::hex_to_pod(spendkey_hex, spendkey);
 
-  wallet.init("", boost::none, boost::asio::ip::tcp::endpoint{}, 0, true, epee::net_utils::ssl_support_t::e_ssl_support_disabled);
-  wallet.set_subaddress_lookahead(1, 1);
-  wallet.generate("", "", spendkey, true, false);
+  wallet->init("", boost::none, boost::asio::ip::tcp::endpoint{}, 0, true, epee::net_utils::ssl_support_t::e_ssl_support_disabled);
+  wallet->set_subaddress_lookahead(1, 1);
+  wallet->generate("", "", spendkey, true, false);
 END_INIT_SIMPLE_FUZZER()
 
 BEGIN_SIMPLE_FUZZER()
@@ -54,6 +57,6 @@ BEGIN_SIMPLE_FUZZER()
   boost::archive::portable_binary_iarchive ar(iss);
   ar >> exported_txs;
   std::vector<tools::wallet2::pending_tx> ptx;
-  bool success = wallet.sign_tx(exported_txs, "/tmp/cold-transaction-test-signed", ptx);
+  bool success = wallet->sign_tx(exported_txs, "/tmp/cold-transaction-test-signed", ptx);
   std::cout << (success ? "signed" : "error") << std::endl;
 END_SIMPLE_FUZZER()
diff --git a/tests/fuzz/fuzzer.h b/tests/fuzz/fuzzer.h
index 2d0a29dfc..fac7e474a 100644
--- a/tests/fuzz/fuzzer.h
+++ b/tests/fuzz/fuzzer.h
@@ -66,8 +66,12 @@ extern "C" { \
     catch (const std::exception &e) \
     { \
       fprintf(stderr, "Exception: %s\n", e.what()); \
-      return 1; \
+      delete el::base::elStorage; \
+      el::base::elStorage = NULL; \
+      return 0; \
     } \
+    delete el::base::elStorage; \
+    el::base::elStorage = NULL; \
     return 0; \
   } \
 }
@@ -122,8 +126,12 @@ int run_fuzzer(int argc, const char **argv, Fuzzer &fuzzer);
       catch (const std::exception &e) \
       { \
         fprintf(stderr, "Exception: %s\n", e.what()); \
-        return 1; \
+        delete el::base::elStorage; \
+        el::base::elStorage = NULL; \
+        return 0; \
       } \
+      delete el::base::elStorage; \
+      el::base::elStorage = NULL; \
       return 0; \
     } \
   }; \
diff --git a/tests/fuzz/signature.cpp b/tests/fuzz/signature.cpp
index cd65e42d0..3743cfdd0 100644
--- a/tests/fuzz/signature.cpp
+++ b/tests/fuzz/signature.cpp
@@ -34,17 +34,20 @@
 #include "wallet/wallet2.h"
 #include "fuzzer.h"
 
-static tools::wallet2 wallet(cryptonote::TESTNET);
+static tools::wallet2 *wallet = NULL;
 static cryptonote::account_public_address address;
 
 BEGIN_INIT_SIMPLE_FUZZER()
+  static tools::wallet2 local_wallet(cryptonote::TESTNET);
+  wallet = &local_wallet;
+
   static const char * const spendkey_hex = "0b4f47697ec99c3de6579304e5f25c68b07afbe55b71d99620bf6cbf4e45a80f";
   crypto::secret_key spendkey;
   epee::string_tools::hex_to_pod(spendkey_hex, spendkey);
 
-  wallet.init("", boost::none, boost::asio::ip::tcp::endpoint{}, 0, true, epee::net_utils::ssl_support_t::e_ssl_support_disabled);
-  wallet.set_subaddress_lookahead(1, 1);
-  wallet.generate("", "", spendkey, true, false);
+  wallet->init("", boost::none, boost::asio::ip::tcp::endpoint{}, 0, true, epee::net_utils::ssl_support_t::e_ssl_support_disabled);
+  wallet->set_subaddress_lookahead(1, 1);
+  wallet->generate("", "", spendkey, true, false);
 
   cryptonote::address_parse_info info;
   if (!cryptonote::get_account_address_from_str_or_url(info, cryptonote::TESTNET, "9uVsvEryzpN8WH2t1WWhFFCG5tS8cBNdmJYNRuckLENFimfauV5pZKeS1P2CbxGkSDTUPHXWwiYE5ZGSXDAGbaZgDxobqDN"))
@@ -56,6 +59,6 @@ BEGIN_INIT_SIMPLE_FUZZER()
 END_INIT_SIMPLE_FUZZER()
 
 BEGIN_SIMPLE_FUZZER()
-  bool valid = wallet.verify("test", address, std::string((const char*)buf, len));
+  bool valid = wallet->verify("test", address, std::string((const char*)buf, len));
   std::cout << "Signature " << (valid ? "valid" : "invalid") << std::endl;
 END_SIMPLE_FUZZER()