upgrade zlib to 1.2.2

acinclude.m4:
  clarify help text

1 files changed, 4 insertions, 0 deletions

diff --git a/zlib/inflate.c b/zlib/inflate.c
index a53b5c7446e..c6d38266d07 100644
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -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,6 +862,9 @@ int flush;
                 }
             }
 
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
             /* build code tables */
             state->next = state->codes;
             state->lencode = (code const FAR *)(state->next);