From 7dbfa36c109fe1d4aa39958473fcdb74a4456a20 Mon Sep 17 00:00:00 2001 From: roytam1 Date: Fri, 29 Apr 2022 23:30:02 +0800 Subject: [PATCH] import from `custom` branch of UXP: zlib: also pick up https://github.com/madler/zlib/commit/4346a16853e19b45787ce933666026903fb8f3f8 (eb6e4fba) --- modules/zlib/src/deflate.c | 3 ++- security/nss/lib/zlib/deflate.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/zlib/src/deflate.c b/modules/zlib/src/deflate.c index 27f5ace8a..712d950d4 100644 --- a/modules/zlib/src/deflate.c +++ b/modules/zlib/src/deflate.c @@ -617,7 +617,8 @@ int ZEXPORT deflatePrime (strm, bits, value) if (deflateStateCheck(strm)) return Z_STREAM_ERROR; s = strm->state; - if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + if (bits < 0 || bits > 16 || + s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) return Z_BUF_ERROR; do { put = Buf_size - s->bi_valid; diff --git a/security/nss/lib/zlib/deflate.c b/security/nss/lib/zlib/deflate.c index 48dfcb139..725c7086a 100644 --- a/security/nss/lib/zlib/deflate.c +++ b/security/nss/lib/zlib/deflate.c @@ -586,7 +586,8 @@ int ZEXPORT deflatePrime (strm, bits, value) if (deflateStateCheck(strm)) return Z_STREAM_ERROR; s = strm->state; - if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + if (bits < 0 || bits > 16 || + s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) return Z_BUF_ERROR; do { put = Buf_size - s->bi_valid;