zlib-intel: update

lib/zlib-intel/crc_folding.c

@@ -339,11 +339,8 @@ ZLIB_INTERNAL void crc_fold_copy(unsigned crc[4 * 5],
  xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t1);
  xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t2);
 
- if (len == 0)
- goto done;
-
+ src += 48;
  dst += 48;
- xmm_crc_part = _mm_load_si128((__m128i *)src + 3);
  } else if (len + 32 >= 0) {
  len += 32;
 
@@ -358,11 +355,8 @@ ZLIB_INTERNAL void crc_fold_copy(unsigned crc[4 * 5],
  xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t0);
  xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t1);
 
- if (len == 0)
- goto done;
-
+ src += 32;
  dst += 32;
- xmm_crc_part = _mm_load_si128((__m128i *)src + 2);
  } else if (len + 48 >= 0) {
  len += 48;
 
@@ -374,19 +368,17 @@ ZLIB_INTERNAL void crc_fold_copy(unsigned crc[4 * 5],
 
  xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t0);
 
- if (len == 0)
- goto done;
-
+ src += 16;
  dst += 16;
- xmm_crc_part = _mm_load_si128((__m128i *)src + 1);
  } else {
  len += 64;
- if (len == 0)
- goto done;
- xmm_crc_part = _mm_load_si128((__m128i *)src);
  }
 
- _mm_storeu_si128((__m128i *)partial_buf, xmm_crc_part);
+ if (len == 0)
+ goto done;
+
+ memcpy(partial_buf, src, len);
+ xmm_crc_part = _mm_load_si128((__m128i *)partial_buf);
  memcpy(dst, partial_buf, len);
 
 partial:

lib/zlib-intel/deflate.c

@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
- " deflate 1.2.11.1 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
+ " deflate 1.2.12.1 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
 /*
  If you use the zlib library in a product, an acknowledgment is welcome
  in the documentation of your product. If for some reason you cannot
@@ -237,11 +237,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
  int wrap = 1;
  static const char my_version[] = ZLIB_VERSION;
 
- ushf *overlay;
- /* We overlay pending_buf and d_buf+l_buf. This works since the average
- * output size for (length,distance) codes is <= 24 bits.
- */
-
  if (version == Z_NULL || version[0] != my_version[0] ||
  stream_size != sizeof(z_stream)) {
  return Z_VERSION_ERROR;
@@ -324,9 +319,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 
  s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
 
- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
- s->pending_buf = (uchf *) overlay;
- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+ /* We overlay pending_buf and sym_buf. This works since the average size
+ * for length/distance pairs over any compressed block is assured to be 31
+ * bits or less.
+ *
+ * Analysis: The longest fixed codes are a length code of 8 bits plus 5
+ * extra bits, for lengths 131 to 257. The longest fixed distance codes are
+ * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
+ * possible fixed-codes length/distance pair is then 31 bits total.
+ *
+ * sym_buf starts one-fourth of the way into pending_buf. So there are
+ * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
+ * in sym_buf is three bytes -- two for the distance and one for the
+ * literal/length. As each symbol is consumed, the pointer to the next
+ * sym_buf value to read moves forward three bytes. From that symbol, up to
+ * 31 bits are written to pending_buf. The closest the written pending_buf
+ * bits gets to the next sym_buf symbol to read is just before the last
+ * code is written. At that time, 31*(n-2) bits have been written, just
+ * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
+ * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
+ * symbols are written.) The closest the writing gets to what is unread is
+ * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
+ * can range from 128 to 32768.
+ *
+ * Therefore, at a minimum, there are 142 bits of space between what is
+ * written and what is read in the overlain buffers, so the symbols cannot
+ * be overwritten by the compressed data. That space is actually 139 bits,
+ * due to the three-bit fixed-code block header.
+ *
+ * That covers the case where either Z_FIXED is specified, forcing fixed
+ * codes, or when the use of fixed codes is chosen, because that choice
+ * results in a smaller compressed block than dynamic codes. That latter
+ * condition then assures that the above analysis also covers all dynamic
+ * blocks. A dynamic-code block will only be chosen to be emitted if it has
+ * fewer bits than a fixed-code block would for the same set of symbols.
+ * Therefore its average symbol length is assured to be less than 31. So
+ * the compressed data for a dynamic block also cannot overwrite the
+ * symbols from which it is being constructed.
+ */
+
+ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
+ s->pending_buf_size = (ulg)s->lit_bufsize * 4;
 
  if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
  s->pending_buf == Z_NULL) {
@@ -335,8 +368,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
  deflateEnd (strm);
  return Z_MEM_ERROR;
  }
- s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+ s->sym_buf = s->pending_buf + s->lit_bufsize;
+ s->sym_end = (s->lit_bufsize - 1) * 3;
+ /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
+ * on 16 bit machines and because stored blocks are restricted to
+ * 64K-1 bytes.
+ */
 
  s->level = level;
  s->strategy = strategy;
@@ -553,7 +590,8 @@ int ZEXPORT deflatePrime (strm, bits, value)
 
  if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
  s = strm->state;
- if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+ if (bits < 0 || bits > 16 ||
+ s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
  return Z_BUF_ERROR;
  do {
  put = Buf_size - s->bi_valid;
@@ -1125,7 +1163,6 @@ int ZEXPORT deflateCopy (dest, source)
 #else
  deflate_state *ds;
  deflate_state *ss;
- ushf *overlay;
 
 
  if (deflateStateCheck(source) || dest == Z_NULL) {
@@ -1145,8 +1182,7 @@ int ZEXPORT deflateCopy (dest, source)
  ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
  ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos));
  ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos));
- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
- ds->pending_buf = (uchf *) overlay;
+ ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
 
  if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
  ds->pending_buf == Z_NULL) {
@@ -1160,8 +1196,7 @@ int ZEXPORT deflateCopy (dest, source)
  zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
 
  ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+ ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
 
  ds->l_desc.dyn_tree = ds->dyn_ltree;
  ds->d_desc.dyn_tree = ds->dyn_dtree;
@@ -1717,7 +1752,7 @@ local block_state deflate_fast(s, flush)
  FLUSH_BLOCK(s, 1);
  return finish_done;
  }
- if (s->last_lit)
+ if (s->sym_next)
  FLUSH_BLOCK(s, 0);
  return block_done;
 }
@@ -1848,7 +1883,7 @@ local block_state deflate_slow(s, flush)
  FLUSH_BLOCK(s, 1);
  return finish_done;
  }
- if (s->last_lit)
+ if (s->sym_next)
  FLUSH_BLOCK(s, 0);
  return block_done;
 }
@@ -1923,7 +1958,7 @@ local block_state deflate_rle(s, flush)
  FLUSH_BLOCK(s, 1);
  return finish_done;
  }
- if (s->last_lit)
+ if (s->sym_next)
  FLUSH_BLOCK(s, 0);
  return block_done;
 }
@@ -1962,7 +1997,7 @@ local block_state deflate_huff(s, flush)
  FLUSH_BLOCK(s, 1);
  return finish_done;
  }
- if (s->last_lit)
+ if (s->sym_next)
  FLUSH_BLOCK(s, 0);
  return block_done;
 }

lib/zlib-intel/deflate.h

@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2016 Jean-loup Gailly
+ * Copyright (C) 1995-2018 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -230,7 +230,7 @@ typedef struct internal_state {
  /* Depth of each subtree used as tie breaker for trees of equal frequency
  */
 
- uchf *l_buf;  /* buffer for literals or lengths */
+ uchf *sym_buf; /* buffer for distances and literals/lengths */
 
  uInt lit_bufsize;
  /* Size of match buffer for literals/lengths. There are 4 reasons for
@@ -252,13 +252,8 @@ typedef struct internal_state {
  * - I can't count above 4
  */
 
- uInt last_lit; /* running index in l_buf */
-
- ushf *d_buf;
- /* Buffer for distances. To simplify the code, d_buf and l_buf have
- * the same number of elements. To use different lengths, an extra flag
- * array would be necessary.
- */
+ uInt sym_next; /* running index in sym_buf */
+ uInt sym_end; /* symbol table full when sym_next reaches this */
 
  ulg opt_len; /* bit length of current block with optimal trees */
  ulg static_len; /* bit length of current block with static trees */
@@ -344,20 +339,22 @@ void ZLIB_INTERNAL bi_windup OF((deflate_state *s));
 
 # define _tr_tally_lit(s, c, flush) \
  { uch cc = (c); \
- s->d_buf[s->last_lit] = 0; \
- s->l_buf[s->last_lit++] = cc; \
+ s->sym_buf[s->sym_next++] = 0; \
+ s->sym_buf[s->sym_next++] = 0; \
+ s->sym_buf[s->sym_next++] = cc; \
  s->dyn_ltree[cc].Freq++; \
- flush = (s->last_lit == s->lit_bufsize-1); \
+ flush = (s->sym_next == s->sym_end); \
  }
 # define _tr_tally_dist(s, distance, length, flush) \
  { uch len = (uch)(length); \
  ush dist = (ush)(distance); \
- s->d_buf[s->last_lit] = dist; \
- s->l_buf[s->last_lit++] = len; \
+ s->sym_buf[s->sym_next++] = (uch)dist; \
+ s->sym_buf[s->sym_next++] = (uch)(dist >> 8); \
+ s->sym_buf[s->sym_next++] = len; \
  dist--; \
  s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
  s->dyn_dtree[d_code(dist)].Freq++; \
- flush = (s->last_lit == s->lit_bufsize-1); \
+ flush = (s->sym_next == s->sym_end); \
  }
 #else
 # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)

lib/zlib-intel/deflate_medium.c

@@ -164,6 +164,10 @@ static void fizzle_matches(deflate_state *s, struct match *current, struct match
  match--;
  orig--;
  changed ++;
+
+ /* Make sure to avoid an out-of-bounds read on the next iteration */
+ if (match < s->window || orig < s->window)
+ break;
  }
 
  if (!changed)
@@ -249,7 +253,7 @@ block_state deflate_medium(deflate_state *s, int flush)
  insert_match(s, current_match);
 
  /* now, look ahead one */
- if (s->lookahead > MIN_LOOKAHEAD) {
+ if (s->lookahead - current_match.match_length > MIN_LOOKAHEAD) {
  s->strstart = current_match.strstart + current_match.match_length;
  INSERT_STRING(s, s->strstart, hash_head);
 
@@ -305,7 +309,7 @@ block_state deflate_medium(deflate_state *s, int flush)
  FLUSH_BLOCK(s, 1);
  return finish_done;
  }
- if (s->last_lit)
+ if (s->sym_next)
  FLUSH_BLOCK(s, 0);
  return block_done;
 }

lib/zlib-intel/gzguts.h

@@ -1,5 +1,5 @@
 /* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
+ * Copyright (C) 2004-2019 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -190,6 +190,7 @@ typedef struct {
  /* just for writing */
  int level; /* compression level */
  int strategy; /* compression strategy */
+ int reset; /* true if a reset is pending after a Z_FINISH */
  /* seek request */
  z_off64_t skip; /* amount to skip (already rewound if backwards) */
  int seek; /* true if seek request pending */