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

add null checks

Browse Source
This commit is contained in:
Jeff Becker 2016-09-03 16:43:02 -04:00
parent 82f46464f3
commit f0bc2a3645
No known key found for this signature in database
GPG Key ID: AB950234D6EA286B
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Datagram.cpp
View File

@ -195,24 +195,24 @@ namespace datagram
DatagramSession::Info DatagramSession::GetSessionInfo() const DatagramSession::Info DatagramSession::GetSessionInfo() const
{ {
if(!m_RoutingSession) if(!m_RoutingSession)
return DatagramSession::Info{nullptr, nullptr, m_LastUse, m_LastSuccess}; return DatagramSession::Info(nullptr, nullptr, m_LastUse, m_LastSuccess);
auto routingPath = m_RoutingSession->GetSharedRoutingPath(); auto routingPath = m_RoutingSession->GetSharedRoutingPath();
if (!routingPath) if (!routingPath)
return DatagramSession::Info{nullptr, nullptr, m_LastUse, m_LastSuccess}; return DatagramSession::Info(nullptr, nullptr, m_LastUse, m_LastSuccess);
auto lease = routingPath->remoteLease; auto lease = routingPath->remoteLease;
auto tunnel = routingPath->outboundTunnel; auto tunnel = routingPath->outboundTunnel;
if(lease) if(lease)
{ {
if(tunnel) if(tunnel)
return DatagramSession::Info{lease->tunnelGateway, tunnel->GetEndpointIdentHash(), m_LastUse, m_LastSuccess}; return DatagramSession::Info(lease->tunnelGateway, tunnel->GetEndpointIdentHash(), m_LastUse, m_LastSuccess);
else else
return DatagramSession::Info{lease->tunnelGateway, nullptr, m_LastUse, m_LastSuccess}; return DatagramSession::Info(lease->tunnelGateway, nullptr, m_LastUse, m_LastSuccess);
} }
else if(tunnel) else if(tunnel)
return DatagramSession::Info{nullptr, tunnel->GetEndpointIdentHash(), m_LastUse, m_LastSuccess}; return DatagramSession::Info(nullptr, tunnel->GetEndpointIdentHash(), m_LastUse, m_LastSuccess);
else else
return DatagramSession::Info{nullptr, nullptr, m_LastUse, m_LastSuccess}; return DatagramSession::Info(nullptr, nullptr, m_LastUse, m_LastSuccess);
} }
void DatagramSession::HandleSend(std::shared_ptr<I2NPMessage> msg) void DatagramSession::HandleSend(std::shared_ptr<I2NPMessage> msg)

11
Datagram.h
View File

@ -53,11 +53,14 @@ namespace datagram
const uint64_t activity; const uint64_t activity;
const uint64_t success; const uint64_t success;
Info() : IBGW(nullptr), OBEP(nullptr), activity(0), success(0) {} Info() : IBGW(nullptr), OBEP(nullptr), activity(0), success(0) {}
Info(const i2p::data::IdentHash & ibgw, const i2p::data::IdentHash & obep, const uint64_t a, const uint64_t s) : Info(const uint8_t * ibgw, const uint8_t * obep, const uint64_t a, const uint64_t s) :
IBGW(new i2p::data::IdentHash(ibgw.data())),
OBEP(new i2p::data::IdentHash(obep.data())),
activity(a), activity(a),
success(s) {} success(s) {
if(ibgw) IBGW = new i2p::data::IdentHash(ibgw);
else IBGW = nullptr;
if(obep) OBEP = new i2p::data::IdentHash(obep);
else OBEP = nullptr;
}
~Info() ~Info()
{ {
if(IBGW) delete IBGW; if(IBGW) delete IBGW;

4
HTTPServer.cpp
View File

@ -352,14 +352,14 @@ namespace http {
s << "<td>" << info.RemoteIdent.ToBase32() << "</td>"; s << "<td>" << info.RemoteIdent.ToBase32() << "</td>";
s << "<td>"; s << "<td>";
if(info.CurrentIBGW) if(info.CurrentIBGW)
s << info.CurrentIBGW->ToBase64(); s << info.CurrentIBGW->ToBase64().c_str();
else else
s << "(none)"; s << "(none)";
s << "</td>"; s << "</td>";
s << "<td>"; s << "<td>";
if(info.CurrentOBEP) if(info.CurrentOBEP)
s << info.CurrentOBEP->ToBase64(); s << info.CurrentOBEP->ToBase64().c_str();
else else
s << "(none)"; s << "(none)";
s << "</td>"; s << "</td>";