inflate_fast: sout is already a short so ptr arith was off by one.

51ea3f6a · Joakim Tjernlund <[email protected]> · 2010-03-10 15:23:57 -08:00

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 <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 51ea3f6a4571e9283e2ff79b74bcedfc2986dbe2
Parents: e69eae65

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
lib/zlib_inflate/inffast.c	modified	+1	−1	View file

lib/zlib_inflate/inffast.c

View file

diff --git a/lib/zlib_inflate/inffast.c b/lib/zlib_inflate/inffast.c
index fa62fc7..2c13ecc 100644
--- a/lib/zlib_inflate/inffast.c
+++ b/lib/zlib_inflate/inffast.c
@@ -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 */