Merge pull request #81 from mdp/fixguard

[proxmark3-svn] / zlib / inflate.c

diff --git a/zlib/inflate.c b/zlib/inflate.c
index 091b9a22fe87d53992535cf57fa2a2099c4fb61b..3a945f3ce69168c144dc68e37a9136b20b0b389c 100644 (file)
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -1509,8 +1509,8 @@ int subvert;
 
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
-    state->sane = !subvert;
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+    state->sane = !subvert;
     return Z_OK;
 #else
     state->sane = 1;
@@ -1523,7 +1523,8 @@ z_streamp strm;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return (long)(((unsigned long)0 - 1) << 16);
     state = (struct inflate_state FAR *)strm->state;
     return ((long)(state->back) << 16) +
         (state->mode == COPY ? state->length :