diff options
-rw-r--r-- | snappy-sinksource.cc | 1 | ||||
-rw-r--r-- | snappy-sinksource.h | 1 | ||||
-rw-r--r-- | snappy.cc | 13 |
3 files changed, 12 insertions, 3 deletions
diff --git a/snappy-sinksource.cc b/snappy-sinksource.cc index 1017895..5844552 100644 --- a/snappy-sinksource.cc +++ b/snappy-sinksource.cc @@ -68,5 +68,4 @@ char* UncheckedByteArraySink::GetAppendBuffer(size_t len, char* scratch) { return dest_; } - } diff --git a/snappy-sinksource.h b/snappy-sinksource.h index 430baea..faabfa1 100644 --- a/snappy-sinksource.h +++ b/snappy-sinksource.h @@ -60,6 +60,7 @@ class Sink { // The default implementation always returns the scratch buffer. virtual char* GetAppendBuffer(size_t length, char* scratch); + private: // No copying Sink(const Sink&); @@ -805,6 +805,15 @@ static bool InternalUncompress(Source* r, SnappyDecompressor decompressor(r); uint32 uncompressed_len = 0; if (!decompressor.ReadUncompressedLength(&uncompressed_len)) return false; + return InternalUncompressAllTags( + &decompressor, writer, uncompressed_len, max_len); +} + +template <typename Writer> +static bool InternalUncompressAllTags(SnappyDecompressor* decompressor, + Writer* writer, + uint32 uncompressed_len, + uint32 max_len) { // Protect against possible DoS attack if (static_cast<uint64>(uncompressed_len) > max_len) { return false; @@ -813,8 +822,8 @@ static bool InternalUncompress(Source* r, writer->SetExpectedLength(uncompressed_len); // Process the entire input - decompressor.DecompressAllTags(writer); - return (decompressor.eof() && writer->CheckLength()); + decompressor->DecompressAllTags(writer); + return (decompressor->eof() && writer->CheckLength()); } bool GetUncompressedLength(Source* source, uint32* result) { |