CVE-2016-9842

Cherry-picked from: madler@e54e129 This is CVE-2016-9842 fix.
cloudflare · Oct 13, 2023 · 47f1285 · 47f1285
1 parent a3ba995
commit 47f1285
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/inflate.c b/inflate.c
@@ -1585,9 +1585,10 @@ int ZEXPORT inflateValidate(z_streamp strm, int check) {
 long ZEXPORT inflateMark(z_streamp strm) {
     struct inflate_state FAR *state;
 
-    if (inflateStateCheck(strm)) return ULONG_MAX << 16;
+    if (inflateStateCheck(strm))
+        return (long)(((unsigned long)0 - 1) << 16);
     state = (struct inflate_state FAR *)strm->state;
-    return ((long)(state->back) << 16) +
+    return (long)(((unsigned long)((long)state->back)) << 16) +
         (state->mode == COPY ? state->length :
             (state->mode == MATCH ? state->was - state->length : 0));
 }