diff options
| -rw-r--r-- | validat1.cpp | 6 | ||||
| -rw-r--r-- | zinflate.cpp | 8 | ||||
| -rw-r--r-- | zinflate.h | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/validat1.cpp b/validat1.cpp index cd8655b4..e81a46c6 100644 --- a/validat1.cpp +++ b/validat1.cpp @@ -623,7 +623,7 @@ bool TestRandomPool() std::cout << "FAILED:";
else
std::cout << "passed:";
- std::cout << " GenerateWord32 and Crop\n";
+ std::cout << " GenerateWord32 and Crop\n";
}
#if !defined(NO_OS_DEPENDENCE)
@@ -711,7 +711,7 @@ bool TestRandomPool() std::cout << "FAILED:";
else
std::cout << "passed:";
- std::cout << " GenerateWord32 and Crop\n";
+ std::cout << " GenerateWord32 and Crop\n";
}
#endif
@@ -808,7 +808,7 @@ bool TestAutoSeededX917() std::cout << "FAILED:";
else
std::cout << "passed:";
- std::cout << " GenerateWord32 and Crop\n";
+ std::cout << " GenerateWord32 and Crop\n";
std::cout.flush();
return pass;
diff --git a/zinflate.cpp b/zinflate.cpp index 62431771..ee15c945 100644 --- a/zinflate.cpp +++ b/zinflate.cpp @@ -552,12 +552,18 @@ bool Inflator::DecodeBody() case DISTANCE_BITS:
// TODO: this surfaced during fuzzing. What do we do???
CRYPTOPP_ASSERT(m_distance < COUNTOF(distanceExtraBits));
- bits = (m_distance >= COUNTOF(distanceExtraBits)) ? distanceExtraBits[29] : distanceExtraBits[m_distance];
+ if (m_distance >= COUNTOF(distanceExtraBits))
+ throw BadDistanceErr();
+ bits = distanceExtraBits[m_distance];
if (!m_reader.FillBuffer(bits))
{
m_nextDecode = DISTANCE_BITS;
break;
}
+ // TODO: this surfaced during fuzzing. What do we do???
+ CRYPTOPP_ASSERT(m_distance < COUNTOF(distanceStarts));
+ if (m_distance >= COUNTOF(distanceStarts))
+ throw BadDistanceErr();
m_distance = m_reader.GetBits(bits) + distanceStarts[m_distance];
OutputPast(m_literal, m_distance);
}
@@ -98,8 +98,12 @@ public: Err(ErrorType e, const std::string &s)
: Exception(e, s) {}
};
+ //! \brief Exception thrown when a truncated stream is encountered
class UnexpectedEndErr : public Err {public: UnexpectedEndErr() : Err(INVALID_DATA_FORMAT, "Inflator: unexpected end of compressed block") {}};
+ //! \brief Exception thrown when a bad block is encountered
class BadBlockErr : public Err {public: BadBlockErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in compressed block") {}};
+ //! \brief Exception thrown when an invalid distance is encountered
+ class BadDistanceErr : public Err {public: BadDistanceErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in bit distance") {}};
//! \brief RFC 1951 Decompressor
//! \param attachment the filter's attached transformation
|