summaryrefslogtreecommitdiffstats
path: root/lib/libz
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-09-22 22:35:42 +0000
committerdim <dim@FreeBSD.org>2015-09-22 22:35:42 +0000
commit880b1e9c61c6f0653950a13f206ef1af7ea5a257 (patch)
tree1695f374750ff11b25f79135d794cdf00edba905 /lib/libz
parentdd33e832a3f67286476a4098459090f04c9c6904 (diff)
downloadFreeBSD-src-880b1e9c61c6f0653950a13f206ef1af7ea5a257.zip
FreeBSD-src-880b1e9c61c6f0653950a13f206ef1af7ea5a257.tar.gz
MFC r287541:
In libz's inflateMark(), avoid left-shifting a negative integer, which is undefined. Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D3344
Diffstat (limited to 'lib/libz')
-rw-r--r--lib/libz/inflate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libz/inflate.c b/lib/libz/inflate.c
index 870f89b..b51a8a5 100644
--- a/lib/libz/inflate.c
+++ b/lib/libz/inflate.c
@@ -1504,7 +1504,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 :
OpenPOWER on IntegriCloud