inflate_fast: sout is already a short so ptr arith was off by one.
Joakim Tjernlund [Wed, 10 Mar 2010 23:23:57 +0000 (15:23 -0800)]
inflate_fast() can do either POST INC or PRE INC on its pointers walking
the memory to decompress.  Default is PRE INC.

The sout pointer offset was miscalculated in one case as the calculation
assumed sout was a char * This breaks inflate_fast() iff configured to do
POST INC.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

lib/zlib_inflate/inffast.c

index fa62fc7..2c13ecc 100644 (file)
@@ -286,7 +286,7 @@ void inflate_fast(z_streamp strm, unsigned start)
                    } else { /* dist == 1 or dist == 2 */
                        unsigned short pat16;
 
-                       pat16 = *(sout-2+2*OFF);
+                       pat16 = *(sout-1+OFF);
                        if (dist == 1) {
                                union uu mm;
                                /* copy one char pattern to both bytes */