Add some extra validation to zlib decompression (primarily to shut up a GCC 4.6

warning).

git-svn-id: http://svn.tartarus.org/sgt/putty@9113 cda61777-01e9-0310-a592-d414129be87e

diff --git a/sshzlib.c b/sshzlib.c
index 9c80132514f1eb9ea057515ab803edccbfcf5c27..cc2872405d38ef26fa933d5ccbc48b59eafa01c4 100644 (file)
--- a/sshzlib.c
+++ b/sshzlib.c
@@ -1259,6 +1259,8 @@ int zlib_decompress_block(void *handle, unsigned char *block, int len,
                goto finished;
            nlen = dctx->bits & 0xFFFF;
            EATBITS(16);
+           if (dctx->uncomplen != (nlen ^ 0xFFFF))
+               goto decode_error;
            if (dctx->uncomplen == 0)
                dctx->state = OUTSIDEBLK;       /* block is empty */
            else