Merge #11655: net: Assert state.m_chain_sync.m_work_header in ConsiderEviction
commitaca77a4d58c689dde7cda30cf4eaf5bd3323668e
authorWladimir J. van der Laan <laanwj@gmail.com>
Wed, 15 Nov 2017 12:55:03 +0000 (15 13:55 +0100)
committerWladimir J. van der Laan <laanwj@gmail.com>
Wed, 15 Nov 2017 12:55:40 +0000 (15 13:55 +0100)
tree112a0d705682551fc50b7301fc77f2c276ea680a
parent4db82b7aab4ad64717f742a7318e3dc6811b41be
parent63c2d83e58c7506a1030e7fe4dcea84cdce97147
Merge #11655: net: Assert state.m_chain_sync.m_work_header in ConsiderEviction

63c2d83 Explicitly state assumption that state.m_chain_sync.m_work_header != nullptr in ConsiderEviction (practicalswift)

Pull request description:

  Explicitly state assumption that `state.m_chain_sync.m_work_header != nullptr` in `ConsiderEviction(…)`.

  Static analyzer (and humans!) will see the null-check in ...

  ```
  else if (state.m_chain_sync.m_timeout == 0 || (state.m_chain_sync.m_work_header != nullptr && ...
  ```

  ... and infer that `state.m_chain_sync.m_work_header` might be set to `nullptr` when reaching `else if (state.m_chain_sync.m_timeout > 0 && time_in_seconds > state.m_chain_sync.m_timeout)` and thus flag `state.m_chain_sync.m_work_header->GetBlockHash().ToString()` as a potential null pointer dereference.

  This commit makes the tacit assumption of `state.m_chain_sync.m_work_header != nullptr` explicit.

  Code introduced in 5a6d00c6defc587e22c93e63029fdd538ce8858d ("Permit disconnection of outbound peers on bad/slow chains") which was merged into master four days ago.

  Friendly ping @sdaftuar :-)

Tree-SHA512: 32e5631025b7ba7556a02c89d040fbe339c482a03f28d0dbc9871c699e1f8ac867619b89c5fd41fdcfcf0dc4d7c859295b26ccd988572145cc244261aec18ce9