Fix calling multiple ZlibDecompressor in parallel causes adler32 checksum failure (GH #596, #600)

1 files changed, 5 insertions, 4 deletions

diff --git a/zinflate.h b/zinflate.h
index e352aff7..b35071e5 100644
--- a/zinflate.h
+++ b/zinflate.h
@@ -133,11 +133,11 @@ private:
 	void OutputString(const byte *string, size_t length);

 	void OutputPast(unsigned int length, unsigned int distance);

 

-	static const HuffmanDecoder *FixedLiteralDecoder();

-	static const HuffmanDecoder *FixedDistanceDecoder();

+	void CreateFixedDistanceDecoder();

+	void CreateFixedLiteralDecoder();

 

-	const HuffmanDecoder& GetLiteralDecoder() const;

-	const HuffmanDecoder& GetDistanceDecoder() const;

+	const HuffmanDecoder& GetLiteralDecoder();

+	const HuffmanDecoder& GetDistanceDecoder();

 

 	enum State {PRE_STREAM, WAIT_HEADER, DECODING_BODY, POST_STREAM, AFTER_END};

 	State m_state;

@@ -148,6 +148,7 @@ private:
 	NextDecode m_nextDecode;

 	unsigned int m_literal, m_distance;	// for LENGTH_BITS or DISTANCE_BITS

 	HuffmanDecoder m_dynamicLiteralDecoder, m_dynamicDistanceDecoder;

+	member_ptr<HuffmanDecoder> m_fixedLiteralDecoder, m_fixedDistanceDecoder;

 	LowFirstBitReader m_reader;

 	SecByteBlock m_window;

 	size_t m_current, m_lastFlush;