diff options
| author | Wayne Davison <wayned@samba.org> | 2018-03-25 19:07:22 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2018-03-25 19:11:41 -0700 |
| commit | eec6ab7615535e02cfcb691d44575268bdcf656f (patch) | |
| tree | e8e22ecb4a2f627baef5c1f3a4c8a551421a8cf2 | |
| parent | 5df9847f0610113fae06d82c17f3622d60fb57f6 (diff) | |
| download | android_external_rsync-eec6ab7615535e02cfcb691d44575268bdcf656f.tar.gz android_external_rsync-eec6ab7615535e02cfcb691d44575268bdcf656f.tar.bz2 android_external_rsync-eec6ab7615535e02cfcb691d44575268bdcf656f.zip | |
Avoid a compiler error/warning about shifting a negative value.
Fixes bug #13268.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | zlib/inflate.c | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -4,7 +4,8 @@ Changes since 3.1.3: BUG FIXES: - - ... + - Fix a compiler error/warning about shifting a negative value (in the zlib + code). ENHANCEMENTS: diff --git a/zlib/inflate.c b/zlib/inflate.c index a7555738..cea8e7e4 100644 --- a/zlib/inflate.c +++ b/zlib/inflate.c @@ -1525,7 +1525,7 @@ 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 -(1L << 16); state = (struct inflate_state FAR *)strm->state; return ((long)(state->back) << 16) + (state->mode == COPY ? state->length : |