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

check identity buffer size

Browse Source
This commit is contained in:
orignal 2014-12-04 19:28:20 -05:00
parent 519330015f
commit 4c8d85870b
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AddressBook.cpp
View File

@ -188,7 +188,8 @@ namespace client
}
// if not .b32 we assume full base64 address
i2p::data::IdentityEx dest;
dest.FromBase64 (address);
if (!dest.FromBase64 (address))
return false;
ident = dest.GetIdentHash ();
return true;
}

17
Identity.cpp
View File

@ -157,14 +157,27 @@ namespace data
size_t IdentityEx::FromBuffer (const uint8_t * buf, size_t len)
{
if (len < DEFAULT_IDENTITY_SIZE)
{
LogPrint (eLogError, "Identity buffer length ", len, " is too small");
return 0;
}
memcpy (&m_StandardIdentity, buf, DEFAULT_IDENTITY_SIZE);
delete[] m_ExtendedBuffer;
if (m_StandardIdentity.certificate.length)
{
m_ExtendedLen = be16toh (m_StandardIdentity.certificate.length);
m_ExtendedBuffer = new uint8_t[m_ExtendedLen];
memcpy (m_ExtendedBuffer, buf + DEFAULT_IDENTITY_SIZE, m_ExtendedLen);
if (m_ExtendedLen + DEFAULT_IDENTITY_SIZE <= len)
{
m_ExtendedBuffer = new uint8_t[m_ExtendedLen];
memcpy (m_ExtendedBuffer, buf + DEFAULT_IDENTITY_SIZE, m_ExtendedLen);
}
else
{
LogPrint (eLogError, "Certificate length ", m_ExtendedLen, " exceeds buffer length ", len - DEFAULT_IDENTITY_SIZE);
return 0;
}
}
else
{

4
base64.cpp
View File

@ -79,7 +79,7 @@ namespace data
outCount = 4*n;
else
outCount = 4*(n+1);
if (outCount > len) return -1;
if (outCount > len) return 0;
pd = (unsigned char *)OutBuffer;
for ( i = 0; i<n; i++ ){
acc_1 = *ps++;
@ -158,7 +158,7 @@ namespace data
outCount = 3*n;
else {
outCount = 0;
return -1;
return 0;
}
ps = (unsigned char *)(InBuffer + InCount - 1);