Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 21:37:17 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fixed memory leak

Browse source
This commit is contained in:
orignal 2014-07-19 18:53:02 -04:00
parent 8801a144a0
commit 541a49c359
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
SSUData.cpp
View file

@ -22,7 +22,7 @@ namespace ssu
}
for (auto it: m_SentMessages)
{
for (auto f: it.second)
for (auto f: it.second.fragments)
delete[] f;
}
}
@ -33,7 +33,7 @@ namespace ssu
if (it != m_SentMessages.end ())
{
// delete all ack-ed message's fragments
for (auto f: it->second)
for (auto f: it->second.fragments)
delete[] f;
m_SentMessages.erase (it);
}
@ -59,8 +59,7 @@ namespace ssu
{
uint32_t msgID = be32toh (*(uint32_t *)buf);
buf += 4; // msgID
auto it = m_SentMessages.find (msgID);
int numSentFragments = it->second.size ();
auto it = m_SentMessages.find (msgID);
// process individual Ack bitfields
bool isNonLast = false;
int fragment = 0;
@ -71,6 +70,7 @@ namespace ssu
bitfield &= 0x7F; // clear MSB
if (bitfield && it != m_SentMessages.end ())
{
int numSentFragments = it->second.fragments.size ();
// process bits
uint8_t mask = 0x40;
for (int j = 0; j < 7; j++)
@ -79,8 +79,8 @@ namespace ssu
{
if (fragment < numSentFragments)
{
delete[] it->second[fragment];
it->second[fragment] = nullptr;
delete[] it->second.fragments[fragment];
it->second.fragments[fragment] = nullptr;
}
}
fragment++;
@ -238,7 +238,8 @@ namespace ssu
DeleteI2NPMessage (msg);
return;
}
auto fragments = m_SentMessages[msgID];
SentMessage& sentMessage = m_SentMessages[msgID];
auto& fragments = sentMessage.fragments;
msgID = htobe32 (msgID);
size_t payloadSize = SSU_MTU - sizeof (SSUHeader) - 9; // 9 = flag + #frg(1) + messageID(4) + frag info (3)
size_t len = msg->GetLength ();

9
SSUData.h
View file

@ -49,6 +49,13 @@ namespace ssu
IncompleteMessage (I2NPMessage * m): msg (m), nextFragmentNum (0) {};
~IncompleteMessage () { for (auto it: savedFragments) { delete it; }; };
};
struct SentMessage
{
std::vector<uint8_t *> fragments;
uint32_t nextResendTime; // in seconds
int numResends;
};
class SSUSession;
class SSUData
@ -75,7 +82,7 @@ namespace ssu
SSUSession& m_Session;
std::map<uint32_t, IncompleteMessage *> m_IncomleteMessages;
std::map<uint32_t, std::vector<uint8_t *> > m_SentMessages; // msgID -> fragments
std::map<uint32_t, SentMessage> m_SentMessages; // msgID -> fragments
};
}
}