From 05204025cce2c55293ab55a9e5e380d73b7e90f0 Mon Sep 17 00:00:00 2001
From: norman <norman@apache.org>
Date: Wed, 11 Apr 2012 10:26:29 +0200
Subject: [PATCH] Fix regression in Zlib which was introduced while refactoring
 the code. See #255

---
 .../netty/util/internal/jzlib/InfBlocks.java  | 106 ++++++++++--------
 1 file changed, 59 insertions(+), 47 deletions(-)

diff --git a/common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java b/common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java
index e51d5ee454..7a3ac68a70 100644
--- a/common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java
+++ b/common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java
@@ -124,15 +124,16 @@ final class InfBlocks {
         int m; // bytes to end of window or read pointer
 
         // copy input/output information to locals (UPDATE macro restores)
-
-        p = z.next_in_index;
-        n = z.avail_in;
-        b = bitb;
-        k = bitk;
-
-        q = write;
-        m = q < read? read - q - 1 : end - q;
-        
+        {
+            p = z.next_in_index;
+            n = z.avail_in;
+            b = bitb;
+            k = bitk;
+        }
+        {
+            q = write;
+            m = q < read? read - q - 1 : end - q;
+        }
 
         // process input based on current state
         while (true) {
@@ -160,17 +161,20 @@ final class InfBlocks {
 
                 switch (t >>> 1) {
                 case 0: // stored
-
+                {
                     b >>>= 3;
                     k -= 3;
-
+                }
                     t = k & 7; // go to byte boundary
 
-                    b >>>= t;
-                    k -= t;
+                    {
+                        b >>>= t;
+                        k -= t;
+                    }
                     mode = LENS; // get length of stored block
                     break;
                 case 1: // fixed
+                {
                     int[] bl = new int[1];
                     int[] bd = new int[1];
                     int[][] tl = new int[1][];
@@ -178,24 +182,30 @@ final class InfBlocks {
 
                     InfTree.inflate_trees_fixed(bl, bd, tl, td);
                     codes.init(bl[0], bd[0], tl[0], 0, td[0], 0);
+                }
 
-                    b >>>= 3;
-                    k -= 3;
+                    {
+                        b >>>= 3;
+                        k -= 3;
+                    }
 
                     mode = CODES;
                     break;
                 case 2: // dynamic
 
+                {
                     b >>>= 3;
                     k -= 3;
+                }
 
                     mode = TABLE;
                     break;
                 case 3: // illegal
 
+                {
                     b >>>= 3;
                     k -= 3;
-                    
+                }
                     mode = BAD;
                     z.msg = "invalid block type";
                     r = JZlib.Z_DATA_ERROR;
@@ -342,9 +352,10 @@ final class InfBlocks {
                     }
                 }
 
-
-                b >>>= 14;
-                k -= 14;
+                {
+                    b >>>= 14;
+                    k -= 14;
+                }
 
                 index = 0;
                 mode = BTREE;
@@ -369,9 +380,10 @@ final class InfBlocks {
 
                     blens[border[index ++]] = b & 7;
 
-                    b >>>= 3;
-                    k -= 3;
-
+                    {
+                        b >>>= 3;
+                        k -= 3;
+                    }
                 }
 
                 while (index < 19) {
@@ -493,36 +505,36 @@ final class InfBlocks {
                 }
 
                 tb[0] = -1;
+                {
+                    int[] bl = new int[1];
+                    int[] bd = new int[1];
+                    int[] tl = new int[1];
+                    int[] td = new int[1];
+                    bl[0] = 9; // must be <= 9 for lookahead assumptions
+                    bd[0] = 6; // must be <= 9 for lookahead assumptions
 
-                int[] bl = new int[1];
-                int[] bd = new int[1];
-                int[] tl = new int[1];
-                int[] td = new int[1];
-                bl[0] = 9; // must be <= 9 for lookahead assumptions
-                bd[0] = 6; // must be <= 9 for lookahead assumptions
+                    t = table;
+                    t = inftree.inflate_trees_dynamic(257 + (t & 0x1f),
+                            1 + (t >> 5 & 0x1f), blens, bl, bd, tl, td, hufts,
+                            z);
 
-                t = table;
-                t = inftree.inflate_trees_dynamic(257 + (t & 0x1f),
-                        1 + (t >> 5 & 0x1f), blens, bl, bd, tl, td, hufts,
-                        z);
+                    if (t != JZlib.Z_OK) {
+                        if (t == JZlib.Z_DATA_ERROR) {
+                            blens = null;
+                            mode = BAD;
+                        }
+                        r = t;
 
-                if (t != JZlib.Z_OK) {
-                    if (t == JZlib.Z_DATA_ERROR) {
-                        blens = null;
-                        mode = BAD;
+                        bitb = b;
+                        bitk = k;
+                        z.avail_in = n;
+                        z.total_in += p - z.next_in_index;
+                        z.next_in_index = p;
+                        write = q;
+                        return inflate_flush(z, r);
                     }
-                    r = t;
-
-                    bitb = b;
-                    bitk = k;
-                    z.avail_in = n;
-                    z.total_in += p - z.next_in_index;
-                    z.next_in_index = p;
-                    write = q;
-                    return inflate_flush(z, r);
+                    codes.init(bl[0], bd[0], hufts, tl[0], hufts, td[0]);
                 }
-                codes.init(bl[0], bd[0], hufts, tl[0], hufts, td[0]);
-
                 mode = CODES;
             case CODES:
                 bitb = b;