diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-04-13 06:16:08 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-04-13 06:16:12 +0200 |
| commit | 1f50f0bb389a04b86ccb9045c7addff4c887e065 (patch) | |
| tree | 47c3bdb095d3697771164ce85a1d4649fe4f857b | |
| parent | bd65a76b9d97d7fe36a7cceb23cc44cbec955c21 (diff) | |
| parent | 1c1467f51b6dda92dec974eb59026c2c5ba79ed6 (diff) | |
Merge #21631: i2p: always check the return value of Sock::Wait()
1c1467f51b6dda92dec974eb59026c2c5ba79ed6 i2p: cancel the Accept() method if waiting on the socket errors (Vasil Dimov)
Pull request description:
If `Sock::Wait()` fails, then cancel the `Accept()` method.
Not checking the return value may cause an uninitialized read a few lines below when we read the `occurred` variable.
[Spotted](https://github.com/bitcoin/bitcoin/pull/21630#issuecomment-814765659) by MarcoFalke, thanks!
ACKs for top commit:
laanwj:
Code review ACK 1c1467f51b6dda92dec974eb59026c2c5ba79ed6
practicalswift:
cr ACK 1c1467f51b6dda92dec974eb59026c2c5ba79ed6: patch looks correct and agree with laanwj that `[[nodiscard]]` can be taken in a follow-up PR :)
Tree-SHA512: 57fa8a03a4e055999e23121cd9ed1566a585ece0cf68b74223d8c902804cb6890218c9356d60e0560ccacc6c8542a526356c226ebd48e7b299b4572be312d49b
| -rw-r--r-- | src/i2p.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/i2p.cpp b/src/i2p.cpp index a44f09f043..2ae164633b 100644 --- a/src/i2p.cpp +++ b/src/i2p.cpp @@ -147,7 +147,9 @@ bool Session::Accept(Connection& conn) try { while (!*m_interrupt) { Sock::Event occurred; - conn.sock->Wait(MAX_WAIT_FOR_IO, Sock::RECV, &occurred); + if (!conn.sock->Wait(MAX_WAIT_FOR_IO, Sock::RECV, &occurred)) { + throw std::runtime_error("wait on socket failed"); + } if ((occurred & Sock::RECV) == 0) { // Timeout, no incoming connections within MAX_WAIT_FOR_IO. |