diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-26 21:58:58 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-26 21:58:58 +0200 |
| commit | 0ccb5a03bb72105b295e9a5ae79510c7bfeee112 (patch) | |
| tree | 9cef491ea75e491ac795349b4a9254a92e3a6e8d /modules/zlib/src/inflate.h | |
| parent | ddd7d45862e89d462851d226c8c29e2602633e05 (diff) | |
| download | UXP-0ccb5a03bb72105b295e9a5ae79510c7bfeee112.tar UXP-0ccb5a03bb72105b295e9a5ae79510c7bfeee112.tar.gz UXP-0ccb5a03bb72105b295e9a5ae79510c7bfeee112.tar.lz UXP-0ccb5a03bb72105b295e9a5ae79510c7bfeee112.tar.xz UXP-0ccb5a03bb72105b295e9a5ae79510c7bfeee112.zip | |
Update zlib to 1.2.11
This resolves #676
Diffstat (limited to 'modules/zlib/src/inflate.h')
| -rw-r--r-- | modules/zlib/src/inflate.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/zlib/src/inflate.h b/modules/zlib/src/inflate.h index 95f4986d4..a46cce6b6 100644 --- a/modules/zlib/src/inflate.h +++ b/modules/zlib/src/inflate.h @@ -1,5 +1,5 @@ /* inflate.h -- internal inflate state definition - * Copyright (C) 1995-2009 Mark Adler + * Copyright (C) 1995-2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -18,7 +18,7 @@ /* Possible inflate modes between inflate() calls */ typedef enum { - HEAD, /* i: waiting for magic header */ + HEAD = 16180, /* i: waiting for magic header */ FLAGS, /* i: waiting for method and flags (gzip) */ TIME, /* i: waiting for modification time (gzip) */ OS, /* i: waiting for extra flags and operating system (gzip) */ @@ -77,11 +77,14 @@ typedef enum { CHECK -> LENGTH -> DONE */ -/* state maintained between inflate() calls. Approximately 10K bytes. */ +/* State maintained between inflate() calls -- approximately 7K bytes, not + including the allocated sliding window, which is up to 32K bytes. */ struct inflate_state { + z_streamp strm; /* pointer back to this zlib stream */ inflate_mode mode; /* current inflate mode */ int last; /* true if processing last block */ - int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip, + bit 2 true to validate check value */ int havedict; /* true if dictionary provided */ int flags; /* gzip header method and flags (0 if zlib) */ unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ |