diff options
| author | Mikhail Zaslonko <zaslonko@linux.ibm.com> | 2023-01-26 14:14:23 +0100 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-02-02 22:50:08 -0800 |
| commit | 195c5ad9d179dbea1c9026f2af5b3eb77f8205b3 (patch) | |
| tree | e99b8e3cf630387e2e42bf02601f57f4a0adf8f3 | |
| parent | 9a549338260ac6eaa495095d4c237aee09aa5a99 (diff) | |
| download | lwn-195c5ad9d179dbea1c9026f2af5b3eb77f8205b3.tar.gz lwn-195c5ad9d179dbea1c9026f2af5b3eb77f8205b3.zip | |
lib/zlib: fix DFLTCC not flushing EOBS when creating raw streams
This commit is based on:
https://github.com/zlib-ng/zlib-ng/commit/ca99a88
Link: https://lkml.kernel.org/r/20230126131428.1222214-4-zaslonko@linux.ibm.com
Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | lib/zlib_deflate/deflate.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/zlib_deflate/deflate.c b/lib/zlib_deflate/deflate.c index 8a878d0d892c..f30d6b8a69b2 100644 --- a/lib/zlib_deflate/deflate.c +++ b/lib/zlib_deflate/deflate.c @@ -451,17 +451,24 @@ int zlib_deflate( Assert(strm->avail_out > 0, "bug2"); if (flush != Z_FINISH) return Z_OK; - if (s->noheader) return Z_STREAM_END; - /* Write the zlib trailer (adler32) */ - putShortMSB(s, (uInt)(strm->adler >> 16)); - putShortMSB(s, (uInt)(strm->adler & 0xffff)); + if (!s->noheader) { + /* Write zlib trailer (adler32) */ + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); + } flush_pending(strm); /* If avail_out is zero, the application will call deflate again * to flush the rest. */ - s->noheader = -1; /* write the trailer only once! */ - return s->pending != 0 ? Z_OK : Z_STREAM_END; + if (!s->noheader) { + s->noheader = -1; /* write the trailer only once! */ + } + if (s->pending == 0) { + Assert(s->bi_valid == 0, "bi_buf not flushed"); + return Z_STREAM_END; + } + return Z_OK; } /* ========================================================================= */ |