28 lines
876 B
Diff
28 lines
876 B
Diff
|
From eec6ab7615535e02cfcb691d44575268bdcf656f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Wayne Davison <wayned@samba.org>
|
||
|
|
Date: Sun, 25 Mar 2018 19:07:22 -0700
|
||
|
|
Subject: [PATCH 03/36] Avoid a compiler error/warning about shifting a
|
||
|
|
negative value. Fixes bug #13268.
|
||
|
|
|
||
|
|
Signed-off-by: root <root@localhost.localdomain>
|
||
|
|
---
|
||
|
|
zlib/inflate.c | 2 +-
|
||
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
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 :
|
||
|
|
--
|
||
|
|
2.19.1
|
||
|
|
|