svn commit: r287541 - head/lib/libz
Dimitry Andric
dim at FreeBSD.org
Mon Sep 7 20:55:15 UTC 2015
Author: dim
Date: Mon Sep 7 20:55:14 2015
New Revision: 287541
URL: https://svnweb.freebsd.org/changeset/base/287541
Log:
In libz's inflateMark(), avoid left-shifting a negative integer, which
is undefined.
Reviewed by: delphij
Differential Revision: https://reviews.freebsd.org/D3344
MFC after: 3 days
Modified:
head/lib/libz/inflate.c
Modified: head/lib/libz/inflate.c
==============================================================================
--- head/lib/libz/inflate.c Mon Sep 7 20:05:56 2015 (r287540)
+++ head/lib/libz/inflate.c Mon Sep 7 20:55:14 2015 (r287541)
@@ -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 :
More information about the svn-src-head
mailing list