------------------------------------------------------------ revno: 2322 committer: poy <[email protected]> branch nick: trunk timestamp: Fri 2010-12-03 17:23:18 +0100 message: Update bzip2 to version 1.0.6 modified: bzip2/LICENSE bzip2/blocksort.c bzip2/bzlib.c bzip2/bzlib.h bzip2/bzlib_private.h bzip2/compress.c bzip2/crctable.c bzip2/decompress.c bzip2/huffman.c bzip2/randtable.c changelog.txt
-- lp:dcplusplus https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk Your team Dcplusplus-team is subscribed to branch lp:dcplusplus. To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'bzip2/LICENSE' --- bzip2/LICENSE 2008-03-24 15:37:06 +0000 +++ bzip2/LICENSE 2010-12-03 16:23:18 +0000 @@ -2,7 +2,7 @@ -------------------------------------------------------------------------- This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2007 Julian R Seward. All +documentation, are copyright (C) 1996-2010 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -37,6 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Julian Seward, [email protected] -bzip2/libbzip2 version 1.0.5 of 10 December 2007 +bzip2/libbzip2 version 1.0.6 of 6 September 2010 -------------------------------------------------------------------------- === modified file 'bzip2/blocksort.c' --- bzip2/blocksort.c 2008-03-24 15:37:06 +0000 +++ bzip2/blocksort.c 2010-12-03 16:23:18 +0000 @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <[email protected]> + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward <[email protected]> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. === modified file 'bzip2/bzlib.c' --- bzip2/bzlib.c 2008-03-24 15:37:06 +0000 +++ bzip2/bzlib.c 2010-12-03 16:23:18 +0000 @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <[email protected]> + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward <[email protected]> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. === modified file 'bzip2/bzlib.h' --- bzip2/bzlib.h 2008-03-24 15:37:06 +0000 +++ bzip2/bzlib.h 2010-12-03 16:23:18 +0000 @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <[email protected]> + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward <[email protected]> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. === modified file 'bzip2/bzlib_private.h' --- bzip2/bzlib_private.h 2008-03-24 15:37:06 +0000 +++ bzip2/bzlib_private.h 2010-12-03 16:23:18 +0000 @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <[email protected]> + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward <[email protected]> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -36,7 +36,7 @@ /*-- General stuff. --*/ -#define BZ_VERSION "1.0.5, 10-Dec-2007" +#define BZ_VERSION "1.0.6, 6-Sept-2010" typedef char Char; typedef unsigned char Bool; === modified file 'bzip2/compress.c' --- bzip2/compress.c 2008-03-24 15:37:06 +0000 +++ bzip2/compress.c 2010-12-03 16:23:18 +0000 @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <[email protected]> + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward <[email protected]> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. === modified file 'bzip2/crctable.c' --- bzip2/crctable.c 2008-03-24 15:37:06 +0000 +++ bzip2/crctable.c 2010-12-03 16:23:18 +0000 @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <[email protected]> + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward <[email protected]> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. === modified file 'bzip2/decompress.c' --- bzip2/decompress.c 2008-03-24 15:37:06 +0000 +++ bzip2/decompress.c 2010-12-03 16:23:18 +0000 @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <[email protected]> + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward <[email protected]> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -381,6 +381,13 @@ es = -1; N = 1; do { + /* Check that N doesn't get too big, so that es doesn't + go negative. The maximum value that can be + RUNA/RUNB encoded is equal to the block size (post + the initial RLE), viz, 900k, so bounding N at 2 + million should guard against overflow without + rejecting any legitimate inputs. */ + if (N >= 2*1024*1024) RETURN(BZ_DATA_ERROR); if (nextSym == BZ_RUNA) es = es + (0+1) * N; else if (nextSym == BZ_RUNB) es = es + (1+1) * N; N = N * 2; @@ -485,15 +492,28 @@ RETURN(BZ_DATA_ERROR); /*-- Set up cftab to facilitate generation of T^(-1) --*/ + /* Check: unzftab entries in range. */ + for (i = 0; i <= 255; i++) { + if (s->unzftab[i] < 0 || s->unzftab[i] > nblock) + RETURN(BZ_DATA_ERROR); + } + /* Actually generate cftab. */ s->cftab[0] = 0; for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1]; for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1]; + /* Check: cftab entries in range. */ for (i = 0; i <= 256; i++) { if (s->cftab[i] < 0 || s->cftab[i] > nblock) { /* s->cftab[i] can legitimately be == nblock */ RETURN(BZ_DATA_ERROR); } } + /* Check: cftab entries non-descending. */ + for (i = 1; i <= 256; i++) { + if (s->cftab[i-1] > s->cftab[i]) { + RETURN(BZ_DATA_ERROR); + } + } s->state_out_len = 0; s->state_out_ch = 0; === modified file 'bzip2/huffman.c' --- bzip2/huffman.c 2008-03-24 15:37:06 +0000 +++ bzip2/huffman.c 2010-12-03 16:23:18 +0000 @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <[email protected]> + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward <[email protected]> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. === modified file 'bzip2/randtable.c' --- bzip2/randtable.c 2008-03-24 15:37:06 +0000 +++ bzip2/randtable.c 2010-12-03 16:23:18 +0000 @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <[email protected]> + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward <[email protected]> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. === modified file 'changelog.txt' --- changelog.txt 2010-12-03 16:16:35 +0000 +++ changelog.txt 2010-12-03 16:23:18 +0000 @@ -44,6 +44,7 @@ * [L#300728] Fix infinite recursion when sharing a directory with a broken name on unix (thanks alexander sashnov) * [L#250149] Retry on more possible Coral errors (emtee) * [L#260748] Really readded sfv check (was broken by segmented downloading) (emtee) +* Update bzip2 to version 1.0.6 -- 0.770 2010-07-05 -- * [L#550300] Catch more potential file corruptions (thanks bigmuscle)
_______________________________________________ Mailing list: https://launchpad.net/~linuxdcpp-team Post to : [email protected] Unsubscribe : https://launchpad.net/~linuxdcpp-team More help : https://help.launchpad.net/ListHelp
