diff options
| author | Elliott Hughes <enh@google.com> | 2016-01-19 18:11:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-19 18:11:45 +0000 |
| commit | cec8538e6162907d587c5229b81fc6a025cc1236 (patch) | |
| tree | 16d01da39f5aad5f403c97653c71cfc292b8fae1 | |
| parent | 59f86b5afa934978f98060a70a4f4aa793454682 (diff) | |
| parent | 4f147cf063a9dfd177d3437c857eb8bbec8a6c00 (diff) | |
| download | android_external_zlib-cec8538e6162907d587c5229b81fc6a025cc1236.tar.gz android_external_zlib-cec8538e6162907d587c5229b81fc6a025cc1236.tar.bz2 android_external_zlib-cec8538e6162907d587c5229b81fc6a025cc1236.zip | |
Merge "Avoid shifts of negative values inflateMark()."
| -rw-r--r-- | src/inflate.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/inflate.c b/src/inflate.c index 870f89b..4fd3f3c 100644 --- a/src/inflate.c +++ b/src/inflate.c @@ -1504,9 +1504,10 @@ 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) + + return (long)(((unsigned long)((long)state->back)) << 16) + (state->mode == COPY ? state->length : (state->mode == MATCH ? state->was - state->length : 0)); } |