aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-10-26 22:39:00 +0200
committerRiccardo Spagni <ric@spagni.net>2018-10-26 22:39:00 +0200
commitfc06c5daf8d845ebddd11fcdecefdc65fcde2dc2 (patch)
tree847c3cfc4b1a9794aa9880ecacfe47fdedeac21b /src
parentMerge pull request #4615 (diff)
parentrpc: init m_rpc_version in Message ctor (diff)
downloadmonero-fc06c5daf8d845ebddd11fcdecefdc65fcde2dc2.tar.xz
Merge pull request #4617
3ffbec15 rpc: init m_rpc_version in Message ctor (moneromooo-monero) bfa2dce1 rpc: remove unused ctors (moneromooo-monero) 7cc39845 account: init creation timestamp to 0 (moneromooo-monero) 32123789 wallet2: initialize some scalar fields in ctor where appropriate (moneromooo-monero) 4eca42b2 blockchain_db: initialize m_hardfork in ctor just in case (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/blockchain_db/blockchain_db.h2
-rw-r--r--src/cryptonote_basic/account.cpp1
-rw-r--r--src/rpc/core_rpc_server_commands_defs.h3
-rw-r--r--src/rpc/message.h2
-rw-r--r--src/wallet/wallet2.cpp4
5 files changed, 7 insertions, 5 deletions
diff --git a/src/blockchain_db/blockchain_db.h b/src/blockchain_db/blockchain_db.h
index 396ae7544..71c46d76b 100644
--- a/src/blockchain_db/blockchain_db.h
+++ b/src/blockchain_db/blockchain_db.h
@@ -544,7 +544,7 @@ public:
/**
* @brief An empty constructor.
*/
- BlockchainDB(): m_open(false) { }
+ BlockchainDB(): m_hardfork(NULL), m_open(false) { }
/**
* @brief An empty destructor.
diff --git a/src/cryptonote_basic/account.cpp b/src/cryptonote_basic/account.cpp
index e891a748d..1dc1ad71d 100644
--- a/src/cryptonote_basic/account.cpp
+++ b/src/cryptonote_basic/account.cpp
@@ -136,6 +136,7 @@ DISABLE_VS_WARNINGS(4244 4345)
void account_base::set_null()
{
m_keys = account_keys();
+ m_creation_timestamp = 0;
}
//-----------------------------------------------------------------
void account_base::forget_spend_key()
diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h
index 3b654d4cb..b229841d6 100644
--- a/src/rpc/core_rpc_server_commands_defs.h
+++ b/src/rpc/core_rpc_server_commands_defs.h
@@ -782,9 +782,6 @@ namespace cryptonote
std::string tx_as_hex;
bool do_not_relay;
- request() {}
- explicit request(const transaction &);
-
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(tx_as_hex)
KV_SERIALIZE_OPT(do_not_relay, false)
diff --git a/src/rpc/message.h b/src/rpc/message.h
index 16b8e92fc..56087b998 100644
--- a/src/rpc/message.h
+++ b/src/rpc/message.h
@@ -65,7 +65,7 @@ namespace rpc
static const char* STATUS_BAD_REQUEST;
static const char* STATUS_BAD_JSON;
- Message() : status(STATUS_OK) { }
+ Message() : status(STATUS_OK), rpc_version(0) { }
virtual ~Message() { }
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index fd79da4e9..37b60c5d7 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -813,6 +813,7 @@ wallet_keys_unlocker::~wallet_keys_unlocker()
wallet2::wallet2(network_type nettype, uint64_t kdf_rounds, bool unattended):
m_multisig_rescan_info(NULL),
m_multisig_rescan_k(NULL),
+ m_upper_transaction_weight_limit(0),
m_run(true),
m_callback(0),
m_trusted_daemon(false),
@@ -845,6 +846,9 @@ wallet2::wallet2(network_type nettype, uint64_t kdf_rounds, bool unattended):
m_is_initialized(false),
m_kdf_rounds(kdf_rounds),
is_old_file_format(false),
+ m_watch_only(false),
+ m_multisig(false),
+ m_multisig_threshold(0),
m_node_rpc_proxy(m_http_client, m_daemon_rpc_mutex),
m_subaddress_lookahead_major(SUBADDRESS_LOOKAHEAD_MAJOR),
m_subaddress_lookahead_minor(SUBADDRESS_LOOKAHEAD_MINOR),