Commit 195c5ad9 authored by Mikhail Zaslonko's avatar Mikhail Zaslonko Committed by Andrew Morton
Browse files

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: default avatarMikhail Zaslonko <zaslonko@linux.ibm.com>
Acked-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9a549338

lib/zlib_deflate/deflate.c

+13 −6
Original line number Diff line number Diff line
@@ -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) */

    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.

     */

    if (!s->noheader) {

	s->noheader = -1; /* write the trailer only once! */

    return s->pending != 0 ? Z_OK : Z_STREAM_END;

    }

    if (s->pending == 0) {

	Assert(s->bi_valid == 0, "bi_buf not flushed");

	return Z_STREAM_END;

    }

    return Z_OK;

}



/* ========================================================================= */