zlib 0.92v0.92

author: Mark Adler <madler@alumni.caltech.edu> 2011-09-09 23:08:07 -0700
committer: Mark Adler <madler@alumni.caltech.edu> 2011-09-09 23:08:07 -0700
commit: bdde4e09d21edff02ea5093b7f6eccbf166b272f (patch)
tree: a64632a98a6bea6e5df864d6e5b6f2e51ea69c1c /infblock.c
parent: 1c71d8b13b54f91ddec361d3053ecce26e6ff761 (diff)
download: zlib-bdde4e09d21edff02ea5093b7f6eccbf166b272f.tar.gz
zlib-bdde4e09d21edff02ea5093b7f6eccbf166b272f.tar.bz2
zlib-bdde4e09d21edff02ea5093b7f6eccbf166b272f.zip
1 files changed, 135 insertions, 129 deletions
diff --git a/infblock.c b/infblock.c
index 538fa62..3a9cf85 100644
--- a/infblock.c
+++ b/infblock.c
@@ -12,7 +12,7 @@
 struct inflate_codes_state {int dummy;}; /* for buggy compilers */
 /* Table for deflate from PKZIP's appnote.txt. */
-local uInt border[] = { /* Order of the bit length code lengths */
+local uInt border[] = { /* Order of the bit length code lengths */
        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 /*
@@ -111,13 +111,13 @@ struct inflate_blocks_state *s;
 z_stream *z;
 int r;
 {
-  uInt t;               /* temporary storage */
+  uInt t;               /* temporary storage */
-  uLong b;              /* bit buffer */
+  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
+  uInt k;               /* bits in bit buffer */
-  Byte *p;              /* input data pointer */
+  Byte *p;              /* input data pointer */
-  uInt n;               /* bytes available there */
+  uInt n;               /* bytes available there */
-  Byte *q;              /* output window write pointer */
+  Byte *q;              /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
+  uInt m;               /* bytes to end of window or read pointer */
  /* copy input/output information to locals (UPDATE macro restores) */
  LOAD
@@ -131,44 +131,44 @@ int r;
      s->last = t & 1;
      switch (t >> 1)
      {
-        case 0:                         /* stored */
+        case 0:                         /* stored */
-          Trace((stderr, "inflate:     stored block%s\n",
+          Trace((stderr, "inflate:     stored block%s\n",
-                 s->last ? " (last)" : ""));
+                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
+          DUMPBITS(3)
-          t = k & 7;                    /* go to byte boundary */
+          t = k & 7;                    /* go to byte boundary */
-          DUMPBITS(t)
+          DUMPBITS(t)
-          s->mode = LENS;               /* get length of stored block */
+          s->mode = LENS;               /* get length of stored block */
-          break;
+          break;
-        case 1:                         /* fixed */
+        case 1:                         /* fixed */
-          Trace((stderr, "inflate:     fixed codes block%s\n",
+          Trace((stderr, "inflate:     fixed codes block%s\n",
-                 s->last ? " (last)" : ""));
+                 s->last ? " (last)" : ""));
-          {
+          {
-            uInt bl, bd;
+            uInt bl, bd;
-            inflate_huft *tl, *td;
+            inflate_huft *tl, *td;
-            inflate_trees_fixed(&bl, &bd, &tl, &td);
+            inflate_trees_fixed(&bl, &bd, &tl, &td);
-            s->sub.codes = inflate_codes_new(bl, bd, tl, td, z);
+            s->sub.codes = inflate_codes_new(bl, bd, tl, td, z);
-            if (s->sub.codes == Z_NULL)
+            if (s->sub.codes == Z_NULL)
-            {
+            {
-              r = Z_MEM_ERROR;
+              r = Z_MEM_ERROR;
-              LEAVE
+              LEAVE
-            }
+            }
-          }
+          }
-          DUMPBITS(3)
+          DUMPBITS(3)
-          s->mode = CODES;
+          s->mode = CODES;
-          break;
+          break;
-        case 2:                         /* dynamic */
+        case 2:                         /* dynamic */
-          Trace((stderr, "inflate:     dynamic codes block%s\n",
+          Trace((stderr, "inflate:     dynamic codes block%s\n",
-                 s->last ? " (last)" : ""));
+                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
+          DUMPBITS(3)
-          s->mode = TABLE;
+          s->mode = TABLE;
-          break;
+          break;
-        case 3:                         /* illegal */
+        case 3:                         /* illegal */
-          DUMPBITS(3)
+          DUMPBITS(3)
-          s->mode = BAD;
+          s->mode = BAD;
-          z->msg = "invalid block type";
+          z->msg = "invalid block type";
-          r = Z_DATA_ERROR;
+          r = Z_DATA_ERROR;
-          LEAVE
+          LEAVE
      }
      break;
    case LENS:
@@ -176,24 +176,30 @@ int r;
      if ((~b) >> 16 != (b & 0xffff))
      {
        s->mode = BAD;
-        z->msg = "invalid stored block lengths";
+        z->msg = "invalid stored block lengths";
-        r = Z_DATA_ERROR;
+        r = Z_DATA_ERROR;
-        LEAVE
+        LEAVE
      }
-      k = 0;                            /* dump bits */
      s->sub.left = (uInt)b & 0xffff;
+      k = b = 0;                      /* dump bits */
      Tracev((stderr, "inflate:       stored length %u\n", s->sub.left));
      s->mode = s->sub.left ? STORED : TYPE;
      break;
    case STORED:
-      do {
+      if (n == 0)
-        NEEDBYTE
+        LEAVE
-        NEEDOUT
+      NEEDOUT
-        OUTBYTE(NEXTBYTE)
+      t = s->sub.left;
-      } while (--s->sub.left);
+      if (t > n) t = n;
+      if (t > m) t = m;
+      zmemcpy(q, p, t);
+      p += t;  n -= t;
+      q += t;  m -= t;
+      if ((s->sub.left -= t) != 0)
+        break;
      Tracev((stderr, "inflate:       stored end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
+              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
+              (s->end - s->read) + (q - s->window))));
      s->mode = s->last ? DRY : TYPE;
      break;
    case TABLE:
@@ -204,8 +210,8 @@ int r;
      {
        s->mode = BAD;
        z->msg = "too many length or distance symbols";
-        r = Z_DATA_ERROR;
+        r = Z_DATA_ERROR;
-        LEAVE
+        LEAVE
      }
 #endif
      t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
@@ -214,7 +220,7 @@ int r;
      if ((s->sub.trees.blens = (uInt*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
      {
        r = Z_MEM_ERROR;
-        LEAVE
+        LEAVE
      }
      DUMPBITS(14)
      s->sub.trees.index = 0;
@@ -224,118 +230,118 @@ int r;
      while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
      {
        NEEDBITS(3)
-        s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
+        s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
-        DUMPBITS(3)
+        DUMPBITS(3)
      }
      while (s->sub.trees.index < 19)
        s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
      s->sub.trees.bb = 7;
      t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
-                             &s->sub.trees.tb, z);
+                             &s->sub.trees.tb, z);
      if (t != Z_OK)
      {
        r = t;
-        if (r == Z_DATA_ERROR)
+        if (r == Z_DATA_ERROR)
-          s->mode = BAD;
+          s->mode = BAD;
-        LEAVE
+        LEAVE
      }
      s->sub.trees.index = 0;
      Tracev((stderr, "inflate:       bits tree ok\n"));
      s->mode = DTREE;
    case DTREE:
      while (t = s->sub.trees.table,
-             s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
+             s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
      {
        inflate_huft *h;
-        uInt i, j, c;
+        uInt i, j, c;
        t = s->sub.trees.bb;
        NEEDBITS(t)
-        h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
+        h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
-        t = h->word.what.Bits;
+        t = h->word.what.Bits;
-        c = h->more.Base;
+        c = h->more.Base;
-        if (c < 16)
+        if (c < 16)
-        {
+        {
-          DUMPBITS(t)
+          DUMPBITS(t)
-          s->sub.trees.blens[s->sub.trees.index++] = c;
+          s->sub.trees.blens[s->sub.trees.index++] = c;
-        }
+        }
-        else /* c == 16..18 */
+        else /* c == 16..18 */
-        {
+        {
-          i = c == 18 ? 7 : c - 14;
+          i = c == 18 ? 7 : c - 14;
-          j = c == 18 ? 11 : 3;
+          j = c == 18 ? 11 : 3;
-          NEEDBITS(t + i)
+          NEEDBITS(t + i)
-          DUMPBITS(t)
+          DUMPBITS(t)
-          j += (uInt)b & inflate_mask[i];
+          j += (uInt)b & inflate_mask[i];
-          DUMPBITS(i)
+          DUMPBITS(i)
-          i = s->sub.trees.index;
+          i = s->sub.trees.index;
-          t = s->sub.trees.table;
+          t = s->sub.trees.table;
-          if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
+          if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
-              (c == 16 && i < 1))
+              (c == 16 && i < 1))
-          {
+          {
-            s->mode = BAD;
+            s->mode = BAD;
-            z->msg = "invalid bit length repeat";
+            z->msg = "invalid bit length repeat";
-            r = Z_DATA_ERROR;
+            r = Z_DATA_ERROR;
-            LEAVE
+            LEAVE
-          }
+          }
-          c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
+          c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
-          do {
+          do {
-            s->sub.trees.blens[i++] = c;
+            s->sub.trees.blens[i++] = c;
-          } while (--j);
+          } while (--j);
-          s->sub.trees.index = i;
+          s->sub.trees.index = i;
-        }
+        }
      }
      inflate_trees_free(s->sub.trees.tb, z);
      s->sub.trees.tb = Z_NULL;
      {
-        uInt bl, bd;
+        uInt bl, bd;
-        inflate_huft *tl, *td;
+        inflate_huft *tl, *td;
-        struct inflate_codes_state *c;
+        struct inflate_codes_state *c;
-        bl = 9;
+        bl = 9;
-        bd = 6;
+        bd = 6;
-        t = s->sub.trees.table;
+        t = s->sub.trees.table;
-        t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
+        t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
-                                  s->sub.trees.blens, &bl, &bd, &tl, &td, z);
+                                  s->sub.trees.blens, &bl, &bd, &tl, &td, z);
-        if (t != Z_OK)
+        if (t != Z_OK)
-        {
+        {
-          if (t == (uInt)Z_DATA_ERROR)
+          if (t == (uInt)Z_DATA_ERROR)
-            s->mode = BAD;
+            s->mode = BAD;
-          r = t;
+          r = t;
-          LEAVE
+          LEAVE
-        }
+        }
        Tracev((stderr, "inflate:       trees ok\n"));
-        if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
+        if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
-        {
+        {
-          inflate_trees_free(td, z);
+          inflate_trees_free(td, z);
-          inflate_trees_free(tl, z);
+          inflate_trees_free(tl, z);
-          r = Z_MEM_ERROR;
+          r = Z_MEM_ERROR;
-          LEAVE
+          LEAVE
-        }
+        }
-        ZFREE(z, s->sub.trees.blens);
+        ZFREE(z, s->sub.trees.blens);
-        s->sub.codes = c;
+        s->sub.codes = c;
      }
      s->mode = CODES;
    case CODES:
      UPDATE
      if ((r = inflate_codes(s, z, r)) != Z_STREAM_END)
-        return inflate_flush(s, z, r);
+        return inflate_flush(s, z, r);
      r = Z_OK;
      inflate_codes_free(s->sub.codes, z);
      LOAD
      Tracev((stderr, "inflate:       codes end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
+              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
+              (s->end - s->read) + (q - s->window))));
      if (!s->last)
      {
        s->mode = TYPE;
-        break;
+        break;
      }
      if (k > 7)              /* return unused byte, if any */
      {
        Assert(k < 16, "inflate_codes grabbed too many bytes")
        k -= 8;
-        n++;
+        n++;
-        p--;                    /* can always return one */
+        p--;                    /* can always return one */
      }
      s->mode = DRY;
    case DRY:
author	Mark Adler <madler@alumni.caltech.edu>	2011-09-09 23:08:07 -0700
committer	Mark Adler <madler@alumni.caltech.edu>	2011-09-09 23:08:07 -0700
commit	bdde4e09d21edff02ea5093b7f6eccbf166b272f (patch)
tree	a64632a98a6bea6e5df864d6e5b6f2e51ea69c1c /infblock.c
parent	1c71d8b13b54f91ddec361d3053ecce26e6ff761 (diff)
download	zlib-bdde4e09d21edff02ea5093b7f6eccbf166b272f.tar.gz zlib-bdde4e09d21edff02ea5093b7f6eccbf166b272f.tar.bz2 zlib-bdde4e09d21edff02ea5093b7f6eccbf166b272f.zip