diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 13:48:44 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 13:51:05 +0100 |
| commit | 4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (patch) | |
| tree | ee8a24a92b267f48542eaed1968266a76e945a27 /zlib/contrib/puff | |
| parent | b73c544c61712f7bd57f3c9a0f6046481f58038b (diff) | |
| download | vcxsrv-4bdf8409331f44417c3622bc5ec0e42c0e68afb6.tar.gz vcxsrv-4bdf8409331f44417c3622bc5ec0e42c0e68afb6.tar.bz2 vcxsrv-4bdf8409331f44417c3622bc5ec0e42c0e68afb6.zip | |
Updated zlib to 1.2.8
Diffstat (limited to 'zlib/contrib/puff')
| -rw-r--r-- | zlib/contrib/puff/puff.c | 7 | ||||
| -rw-r--r-- | zlib/contrib/puff/puff.h | 4 | ||||
| -rw-r--r-- | zlib/contrib/puff/pufftest.c | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/zlib/contrib/puff/puff.c b/zlib/contrib/puff/puff.c index df8470c93..ba58483d5 100644 --- a/zlib/contrib/puff/puff.c +++ b/zlib/contrib/puff/puff.c @@ -1,8 +1,8 @@ /* * puff.c - * Copyright (C) 2002-2010 Mark Adler + * Copyright (C) 2002-2013 Mark Adler * For conditions of distribution and use, see copyright notice in puff.h - * version 2.2, 25 Apr 2010 + * version 2.3, 21 Jan 2013 * * puff.c is a simple inflate written to be an unambiguous way to specify the * deflate format. It is not written for speed but rather simplicity. As a @@ -76,6 +76,7 @@ * - Move NIL to puff.h * - Allow incomplete code only if single code length is 1 * - Add full code coverage test to Makefile + * 2.3 21 Jan 2013 - Check for invalid code length codes in dynamic blocks */ #include <setjmp.h> /* for setjmp(), longjmp(), and jmp_buf */ @@ -704,6 +705,8 @@ local int dynamic(struct state *s) int len; /* last length to repeat */ symbol = decode(s, &lencode); + if (symbol < 0) + return symbol; /* invalid symbol */ if (symbol < 16) /* length in 0..15 */ lengths[index++] = symbol; else { /* repeat instruction */ diff --git a/zlib/contrib/puff/puff.h b/zlib/contrib/puff/puff.h index 6a0080ae1..e23a24543 100644 --- a/zlib/contrib/puff/puff.h +++ b/zlib/contrib/puff/puff.h @@ -1,6 +1,6 @@ /* puff.h - Copyright (C) 2002-2010 Mark Adler, all rights reserved - version 2.2, 25 Apr 2010 + Copyright (C) 2002-2013 Mark Adler, all rights reserved + version 2.3, 21 Jan 2013 This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages diff --git a/zlib/contrib/puff/pufftest.c b/zlib/contrib/puff/pufftest.c index 76e35f66b..776481488 100644 --- a/zlib/contrib/puff/pufftest.c +++ b/zlib/contrib/puff/pufftest.c @@ -1,8 +1,8 @@ /* * pufftest.c - * Copyright (C) 2002-2010 Mark Adler + * Copyright (C) 2002-2013 Mark Adler * For conditions of distribution and use, see copyright notice in puff.h - * version 2.2, 25 Apr 2010 + * version 2.3, 21 Jan 2013 */ /* Example of how to use puff(). |