diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/thread_group.h | 2 | ||||
| -rw-r--r-- | src/crypto/oaes_lib.c | 3 | ||||
| -rw-r--r-- | src/mnemonics/language_base.h | 6 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/src/common/thread_group.h b/src/common/thread_group.h index 62e82d832..10add89e0 100644 --- a/src/common/thread_group.h +++ b/src/common/thread_group.h @@ -112,12 +112,10 @@ private: struct work; struct node { - node() = delete; std::unique_ptr<work> ptr; }; struct work { - work() = delete; std::function<void()> f; node next; }; diff --git a/src/crypto/oaes_lib.c b/src/crypto/oaes_lib.c index 4c1446898..2cf598e05 100644 --- a/src/crypto/oaes_lib.c +++ b/src/crypto/oaes_lib.c @@ -639,7 +639,10 @@ static OAES_RET oaes_key_gen( OAES_CTX * ctx, size_t key_size ) _key->data = (uint8_t *) calloc( key_size, sizeof( uint8_t )); if( NULL == _key->data ) + { + free( _key ); return OAES_RET_MEM; + } for( _i = 0; _i < key_size; _i++ ) #ifdef OAES_HAVE_ISAAC diff --git a/src/mnemonics/language_base.h b/src/mnemonics/language_base.h index 9a60f8a53..e0297c847 100644 --- a/src/mnemonics/language_base.h +++ b/src/mnemonics/language_base.h @@ -106,6 +106,12 @@ namespace Language trimmed_word_map = new std::unordered_map<std::string, uint32_t>;
unique_prefix_length = 4;
}
+ virtual ~Base()
+ {
+ delete word_list;
+ delete word_map;
+ delete trimmed_word_map;
+ }
/*!
* \brief Returns a pointer to the word list.
* \return A pointer to the word list.
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index a113c929e..3dafa56f0 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3203,7 +3203,7 @@ uint64_t wallet2::get_dynamic_per_kb_fee_estimate() //---------------------------------------------------------------------------------------------------- uint64_t wallet2::get_per_kb_fee() { - bool use_dyn_fee = use_fork_rules(HF_VERSION_DYNAMIC_FEE, -720 * 14); + bool use_dyn_fee = use_fork_rules(HF_VERSION_DYNAMIC_FEE, -720 * 1); if (!use_dyn_fee) return FEE_PER_KB; try |