From 118b2e3d3469390a34de9f7a8f1975471317237e Mon Sep 17 00:00:00 2001 From: Georgy Treshchev Date: Sun, 1 May 2022 11:33:43 +0400 Subject: [PATCH 1/2] Bit shift fix --- miniz_tinfl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miniz_tinfl.c b/miniz_tinfl.c index 7a20fe3..3d394a9 100644 --- a/miniz_tinfl.c +++ b/miniz_tinfl.c @@ -232,7 +232,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex TINFL_GET_BYTE(2, r->m_zhdr1); counter = (((r->m_zhdr0 * 256 + r->m_zhdr1) % 31 != 0) || (r->m_zhdr1 & 32) || ((r->m_zhdr0 & 15) != 8)); if (!(decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)) - counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) || ((out_buf_size_mask + 1) < (size_t)(1U << (8U + (r->m_zhdr0 >> 4))))); + counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) || ((out_buf_size_mask + 1) < (size_t)(1ULL << (8U + (r->m_zhdr0 >> 4))))); if (counter) { TINFL_CR_RETURN_FOREVER(36, TINFL_STATUS_FAILED); From c610f58a57b6399acdfe222d35c8df2190156df1 Mon Sep 17 00:00:00 2001 From: Georgy Treshchev Date: Mon, 16 May 2022 19:47:54 +0400 Subject: [PATCH 2/2] Replacing "1ULL" with "(size_t)1" --- miniz_tinfl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miniz_tinfl.c b/miniz_tinfl.c index 3d394a9..f7c8815 100644 --- a/miniz_tinfl.c +++ b/miniz_tinfl.c @@ -232,7 +232,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex TINFL_GET_BYTE(2, r->m_zhdr1); counter = (((r->m_zhdr0 * 256 + r->m_zhdr1) % 31 != 0) || (r->m_zhdr1 & 32) || ((r->m_zhdr0 & 15) != 8)); if (!(decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)) - counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) || ((out_buf_size_mask + 1) < (size_t)(1ULL << (8U + (r->m_zhdr0 >> 4))))); + counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) || ((out_buf_size_mask + 1) < (size_t)((size_t)1 << (8U + (r->m_zhdr0 >> 4))))); if (counter) { TINFL_CR_RETURN_FOREVER(36, TINFL_STATUS_FAILED);