arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Additional self tests for Decompressors

pull/416/head
Jeffrey Walton 2017-05-10 20:32:50 -04:00
parent 07dbcc3d96
commit 2a20d09dc6
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
validat0.cpp
View File

@ -2281,6 +2281,32 @@ bool TestHuffmanCodes()
std::cout << "passed:"; std::cout << "passed:";
std::cout << " GenerateCodeLengths" << std::endl; std::cout << " GenerateCodeLengths" << std::endl;
// Try to crash the HuffmanDecoder
for (unsigned int i=0; i<128; ++i)
{
try
{
byte data1[0xfff]; // Place on stack, avoid new
unsigned int data2[0xff];
unsigned int len1 = GlobalRNG().GenerateWord32(0, 0xfff);
GlobalRNG().GenerateBlock(data1, len1);
unsigned int len2 = GlobalRNG().GenerateWord32(0, 0xff);
GlobalRNG().GenerateBlock((byte*)data2, len2*sizeof(unsigned int));
ArraySource source(data1, len1, false);
HuffmanDecoder decoder(data2, len2);
LowFirstBitReader reader(source);
unsigned int val;
for (unsigned int j=0; !source.AnyRetrievable(); ++j)
decoder.Decode(reader, val);
}
catch (const Exception&) {}
}
std::cout << "passed: HuffmanDecoder decode" << std::endl;
return pass; return pass;
} }
#endif #endif

8
zinflate.cpp
View File

@ -128,6 +128,7 @@ void HuffmanDecoder::Initialize(const unsigned int *codeBits, unsigned int nCode
unsigned int len = codeBits[i]; unsigned int len = codeBits[i];
if (len != 0) if (len != 0)
{ {
CRYPTOPP_ASSERT(j < m_codeToValue.size());
code = NormalizeCode(nextCode[len]++, len); code = NormalizeCode(nextCode[len]++, len);
m_codeToValue[j].code = code; m_codeToValue[j].code = code;
m_codeToValue[j].len = len; m_codeToValue[j].len = len;
@ -181,7 +182,7 @@ void HuffmanDecoder::FillCacheEntry(LookupEntry &entry, code_t normalizedCode) c
inline unsigned int HuffmanDecoder::Decode(code_t code, /* out */ value_t &value) const inline unsigned int HuffmanDecoder::Decode(code_t code, /* out */ value_t &value) const
{ {
CRYPTOPP_ASSERT(m_codeToValue.size() > 0); CRYPTOPP_ASSERT(((int)(code & m_cacheMask)) < m_cache.size());
LookupEntry &entry = m_cache[code & m_cacheMask]; LookupEntry &entry = m_cache[code & m_cacheMask];
code_t normalizedCode = 0; code_t normalizedCode = 0;
@ -406,7 +407,10 @@ void Inflator::DecodeHeader()
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
std::fill(codeLengths.begin(), codeLengths+19, 0); std::fill(codeLengths.begin(), codeLengths+19, 0);
for (i=0; i<hclen+4; i++) for (i=0; i<hclen+4; i++)
{
CRYPTOPP_ASSERT(border[i] < codeLengths.size());
codeLengths[border[i]] = m_reader.GetBits(3); codeLengths[border[i]] = m_reader.GetBits(3);
}
try try
{ {
@ -536,12 +540,14 @@ bool Inflator::DecodeBody()
throw BadBlockErr(); throw BadBlockErr();
unsigned int bits; unsigned int bits;
case LENGTH_BITS: case LENGTH_BITS:
CRYPTOPP_ASSERT(m_literal-257 < COUNTOF(lengthExtraBits));
bits = lengthExtraBits[m_literal-257]; bits = lengthExtraBits[m_literal-257];
if (!m_reader.FillBuffer(bits)) if (!m_reader.FillBuffer(bits))
{ {
m_nextDecode = LENGTH_BITS; m_nextDecode = LENGTH_BITS;
break; break;
} }
CRYPTOPP_ASSERT(m_literal-257 < COUNTOF(lengthStarts));
m_literal = m_reader.GetBits(bits) + lengthStarts[m_literal-257]; m_literal = m_reader.GetBits(bits) + lengthStarts[m_literal-257];
case DISTANCE: case DISTANCE:
if (!distanceDecoder.Decode(m_reader, m_distance)) if (!distanceDecoder.Decode(m_reader, m_distance))