Merge pull request cryptonomex#644 from openledger/sanitize-core

Fix some more code sanitizer errors
FollowMyVote · Feb 22, 2018 · 0da4ff2 · 0da4ff2
2 parents 7ec18a4 + fd0567b
commit 0da4ff2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp
@@ -537,7 +537,7 @@ namespace detail {
             _is_finished_syncing = true;
             _self->syncing_finished();
          }
-      } FC_CAPTURE_AND_RETHROW( (blk_msg)(sync_mode) ) }
+      } FC_CAPTURE_AND_RETHROW( (blk_msg)(sync_mode) ) return false; }
 
       virtual void handle_transaction(const graphene::net::trx_message& transaction_message) override
       { try {

diff --git a/libraries/chain/protocol/transaction.cpp b/libraries/chain/protocol/transaction.cpp
@@ -103,6 +103,7 @@ void transaction::get_required_authorities( flat_set<account_id_type>& active, f
 
 
 
+const flat_set<public_key_type> empty_keyset;
 
 struct sign_state
 {
@@ -228,7 +229,7 @@ struct sign_state
 
       sign_state( const flat_set<public_key_type>& sigs,
                   const std::function<const authority*(account_id_type)>& a,
-                  const flat_set<public_key_type>& keys = flat_set<public_key_type>() )
+                  const flat_set<public_key_type>& keys = empty_keyset )
       :get_active(a),available_keys(keys)
       {
          for( const auto& key : sigs )

diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp
@@ -510,7 +510,7 @@ BOOST_AUTO_TEST_CASE( create_committee_member )
       REQUIRE_THROW_WITH_VALUE(op, fee, asset(-600));
       trx.operations.back() = op;
 
-      committee_member_id_type committee_member_id = db.get_index_type<primary_index<simple_index<committee_member_object>>>().get_next_id();
+      committee_member_id_type committee_member_id = db.get_index_type<committee_member_index>().get_next_id();
       PUSH_TX( db, trx, ~0 );
       const committee_member_object& d = committee_member_id(db);