Browse Source

fixed memory leak

pull/73/merge
orignal 10 years ago
parent
commit
b19e6bb5ba
  1. 29
      TunnelEndpoint.cpp

29
TunnelEndpoint.cpp

@ -125,23 +125,25 @@ namespace tunnel
if (fragmentNum == it->second.nextFragmentNum) if (fragmentNum == it->second.nextFragmentNum)
{ {
I2NPMessage * incompleteMessage = it->second.data; I2NPMessage * incompleteMessage = it->second.data;
if (incompleteMessage->len + size >= I2NP_MAX_MESSAGE_SIZE) if (incompleteMessage->len + size < I2NP_MAX_MESSAGE_SIZE) // check if messega is not too long
{
memcpy (incompleteMessage->buf + incompleteMessage->len, fragment, size); // concatenate fragment
incompleteMessage->len += size;
if (isLastFragment)
{
// message complete
HandleNextMessage (it->second);
m_IncompleteMessages.erase (it);
}
else
it->second.nextFragmentNum++;
}
else
{ {
LogPrint ("Fragment ", fragmentNum, " of message ", msgID, "exceeds max I2NP message size. Message dropped"); LogPrint ("Fragment ", fragmentNum, " of message ", msgID, "exceeds max I2NP message size. Message dropped");
i2p::DeleteI2NPMessage (it->second.data); i2p::DeleteI2NPMessage (it->second.data);
m_IncompleteMessages.erase (it); m_IncompleteMessages.erase (it);
continue;
} }
memcpy (incompleteMessage->buf + incompleteMessage->len, fragment, size); // concatenate fragment
incompleteMessage->len += size;
if (isLastFragment)
{
// message complete
HandleNextMessage (it->second);
m_IncompleteMessages.erase (it);
}
else
it->second.nextFragmentNum++;
} }
else else
{ {
@ -157,6 +159,9 @@ namespace tunnel
// last message is follow-on fragment // last message is follow-on fragment
// not passed to anywhere because first fragment // not passed to anywhere because first fragment
i2p::DeleteI2NPMessage (msg); i2p::DeleteI2NPMessage (msg);
else
// delete temporarty copy used for first fragment only
i2p::DeleteI2NPMessage (m.data);
} }
} }
else else

Loading…
Cancel
Save