Avoid a compiler error/warning about shifting a negative value.

Fixes bug #13268.
This commit is contained in:
Wayne Davison
2018-03-25 19:07:22 -07:00
parent 5df9847f06
commit eec6ab7615
2 changed files with 3 additions and 2 deletions

3
NEWS
View File

@@ -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:

View File

@@ -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 :