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

don't invoke gzip for decompression if no compression

Browse source
This commit is contained in:
orignal 2020-05-19 10:48:23 -04:00
parent 9fb59e128b
commit 3db4421aa7
2 changed files with 44 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libi2pd/Gzip.cpp
View file

@ -31,6 +31,21 @@ namespace data
}
size_t GzipInflator::Inflate (const uint8_t * in, size_t inLen, uint8_t * out, size_t outLen)
{
if (inLen < 23) return 0;
if (in[10] == 0x01) // non compressed
{
size_t len = bufle16toh (in + 11);
if (len + 23 < inLen)
{
LogPrint (eLogError, "Gzip: Incorrect length");
return 0;
}
if (len > outLen) len = outLen;
memcpy (out, in + 15, len);
return len;
}
else
{
if (m_IsDirty) inflateReset (&m_Inflator);
m_IsDirty = true;
@ -45,6 +60,7 @@ namespace data
LogPrint (eLogError, "Gzip: Inflate error ", err);
return 0;
}
}
void GzipInflator::Inflate (const uint8_t * in, size_t inLen, std::ostream& os)
{
@ -148,7 +164,7 @@ namespace data
size_t GzipNoCompression (const uint8_t * in, uint16_t inLen, uint8_t * out, size_t outLen)
{
static const uint8_t gzipHeader[11] = { 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xff, 0x01 };
static const uint8_t gzipHeader[11] = { 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x01 };
if (outLen < (size_t)inLen + 23) return 0;
memcpy (out, gzipHeader, 11);
htole16buf (out + 11, inLen);

15
libi2pd/I2PEndian.h
View file

@ -128,5 +128,20 @@ inline void htole64buf(void *buf, uint64_t big64)
htobuf64(buf, htole64(big64));
}
inline uint16_t bufle16toh(const void *buf)
{
return le16toh(buf16toh(buf));
}
inline uint32_t bufle32toh(const void *buf)
{
return le32toh(buf32toh(buf));
}
inline uint64_t bufle64toh(const void *buf)
{
return le64toh(buf64toh(buf));
}
#endif // I2PENDIAN_H__