stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Subject: zlib: Avoid shifts of negative values inflateMark

Browse source 
The C standard says that bit shifts of negative integers is
undefined.  This casts to unsigned values to assure a known
result.

e54e129940.patch
This commit is contained in:
Mark Adler 2015-09-05 17:45:55 -07:00 • committed by Andy Green
parent 4b7144f763
commit b807ccf261
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
win32port/zlib/inflate.c
View file

@ -1472,9 +1472,10 @@ z_streamp strm;
{
struct inflate_state FAR *state;
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 :
(state->mode == MATCH ? state->was - state->length : 0));
if (strm == Z_NULL || strm->state == Z_NULL)
return (long)(((unsigned long)0 - 1) << 16);
state = (struct inflate_state FAR *)strm->state;
return (long)(((unsigned long)((long)state->back)) << 16) +
(state->mode == COPY ? state->length :
(state->mode == MATCH ? state->was - state->length : 0));
}