mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-11-10 00:00:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1885 from Vort/null_check

Browse Source 
Check for null pointer before dereferencing it
This commit is contained in:
orignal 2023-02-22 12:46:08 -05:00 committed by GitHub
commit 692600dfac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libi2pd/NTCP2.cpp
View File

@ -1457,7 +1457,7 @@ namespace transport
void NTCP2Server::HandleAccept (std::shared_ptr<NTCP2Session> conn, const boost::system::error_code& error) void NTCP2Server::HandleAccept (std::shared_ptr<NTCP2Session> conn, const boost::system::error_code& error)
{ {
if (!error) if (!error && conn)
{ {
boost::system::error_code ec; boost::system::error_code ec;
auto ep = conn->GetSocket ().remote_endpoint(ec); auto ep = conn->GetSocket ().remote_endpoint(ec);
@ -1466,17 +1466,14 @@ namespace transport
LogPrint (eLogDebug, "NTCP2: Connected from ", ep); LogPrint (eLogDebug, "NTCP2: Connected from ", ep);
if (!i2p::util::net::IsInReservedRange(ep.address ())) if (!i2p::util::net::IsInReservedRange(ep.address ()))
{ {
if (conn) if (m_PendingIncomingSessions.emplace (ep.address (), conn).second)
{ {
if (m_PendingIncomingSessions.emplace (ep.address (), conn).second) conn->SetRemoteEndpoint (ep);
{ conn->ServerLogin ();
conn->SetRemoteEndpoint (ep); conn = nullptr;
conn->ServerLogin ();
conn = nullptr;
}
else
LogPrint (eLogInfo, "NTCP2: Incoming session from ", ep.address (), " is already pending");
} }
else
LogPrint (eLogInfo, "NTCP2: Incoming session from ", ep.address (), " is already pending");
} }
else else
LogPrint (eLogError, "NTCP2: Incoming connection from invalid IP ", ep.address ()); LogPrint (eLogError, "NTCP2: Incoming connection from invalid IP ", ep.address ());
@ -1507,7 +1504,7 @@ namespace transport
void NTCP2Server::HandleAcceptV6 (std::shared_ptr<NTCP2Session> conn, const boost::system::error_code& error) void NTCP2Server::HandleAcceptV6 (std::shared_ptr<NTCP2Session> conn, const boost::system::error_code& error)
{ {
if (!error) if (!error && conn)
{ {
boost::system::error_code ec; boost::system::error_code ec;
auto ep = conn->GetSocket ().remote_endpoint(ec); auto ep = conn->GetSocket ().remote_endpoint(ec);
@ -1517,17 +1514,14 @@ namespace transport
if (!i2p::util::net::IsInReservedRange(ep.address ()) || if (!i2p::util::net::IsInReservedRange(ep.address ()) ||
i2p::util::net::IsYggdrasilAddress (ep.address ())) i2p::util::net::IsYggdrasilAddress (ep.address ()))
{ {
if (conn) if (m_PendingIncomingSessions.emplace (ep.address (), conn).second)
{ {
if (m_PendingIncomingSessions.emplace (ep.address (), conn).second) conn->SetRemoteEndpoint (ep);
{ conn->ServerLogin ();
conn->SetRemoteEndpoint (ep); conn = nullptr;
conn->ServerLogin ();
conn = nullptr;
}
else
LogPrint (eLogInfo, "NTCP2: Incoming session from ", ep.address (), " is already pending");
} }
else
LogPrint (eLogInfo, "NTCP2: Incoming session from ", ep.address (), " is already pending");
} }
else else
LogPrint (eLogError, "NTCP2: Incoming connection from invalid IP ", ep.address ()); LogPrint (eLogError, "NTCP2: Incoming connection from invalid IP ", ep.address ());