upgraded to zlib 1.2.2 (replaces patch with CAN-2004-0797 vulnerability fix with official upstream fix)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-11-05 15:55:19 +00:00
parent a6285dc957
commit ba0052f3f5
14 changed files with 184 additions and 101 deletions

View File

@@ -109,6 +109,7 @@ z_streamp strm;
state = (struct inflate_state FAR *)strm->state;
strm->total_in = strm->total_out = state->total = 0;
strm->msg = Z_NULL;
strm->adler = 1; /* to support ill-conceived Java test suite */
state->mode = HEAD;
state->last = 0;
state->havedict = 0;
@@ -861,8 +862,8 @@ int flush;
}
}
if (state->mode == BAD)
break;
/* handle error breaks in while */
if (state->mode == BAD) break;
/* build code tables */
state->next = state->codes;