VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/zlib/gzlib.c
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2022-03-31 00:50:51 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2022-03-31 00:52:40 +0200
commit08716954031eb0329fbd1ad2cd3fa593d3a046ab (patch)
tree48683dcf0639fbe7b84e00ea02dacaa4de9fe577 /src/Common/zlib/gzlib.c
parent2be0b2e88ffebf9b63dcda4048ab0a24cd6ec131 (diff)
downloadVeraCrypt-08716954031eb0329fbd1ad2cd3fa593d3a046ab.tar.gz
VeraCrypt-08716954031eb0329fbd1ad2cd3fa593d3a046ab.zip
Update zlib to version 1.2.12
Diffstat (limited to 'src/Common/zlib/gzlib.c')
-rw-r--r--src/Common/zlib/gzlib.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Common/zlib/gzlib.c b/src/Common/zlib/gzlib.c
index 4105e6af..dddaf268 100644
--- a/src/Common/zlib/gzlib.c
+++ b/src/Common/zlib/gzlib.c
@@ -1,11 +1,11 @@
/* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
+ * Copyright (C) 2004-2019 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
#include "gzguts.h"
-#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__BORLANDC__)
# define LSEEK _lseeki64
#else
#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
@@ -81,6 +81,8 @@ local void gz_reset(state)
state->past = 0; /* have not read past end yet */
state->how = LOOK; /* look for gzip header */
}
+ else /* for writing ... */
+ state->reset = 0; /* no deflateReset pending */
state->seek = 0; /* no seek request pending */
gz_error(state, Z_OK, NULL); /* clear error */
state->x.pos = 0; /* no uncompressed data yet */
@@ -397,7 +399,7 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
/* if within raw area while reading, just go there */
if (state->mode == GZ_READ && state->how == COPY &&
state->x.pos + offset >= 0) {
- ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
+ ret = LSEEK(state->fd, offset - (z_off64_t)state->x.have, SEEK_CUR);
if (ret == -1)
return -1;
state->x.have = 0;