Recent zlib does not like Z_FLUSH at the end of inflate().
Reported by: quak@mydiax.ch Obtained from: KAME MFC after: 2 days and approved by re
This commit is contained in:
parent
357228d788
commit
88a89f8617
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=96457
@ -252,14 +252,17 @@ do { \
|
||||
MOREBLOCK();
|
||||
}
|
||||
|
||||
zerror = mode ? inflate(&zs, Z_FINISH)
|
||||
zerror = mode ? inflate(&zs, Z_SYNC_FLUSH)
|
||||
: deflate(&zs, Z_FINISH);
|
||||
|
||||
if (zerror == Z_STREAM_END)
|
||||
break;
|
||||
else if (zerror == Z_OK)
|
||||
; /* once more. */
|
||||
else {
|
||||
else if (zerror == Z_OK) {
|
||||
if (mode && zs.avail_out != 0)
|
||||
goto terminate;
|
||||
else
|
||||
; /* once more. */
|
||||
} else {
|
||||
if (zs.msg) {
|
||||
ipseclog((LOG_ERR, "ipcomp_%scompress: "
|
||||
"%sflate(Z_FINISH): %s\n",
|
||||
|
Loading…
Reference in New Issue
Block a user