Update Compress-Raw-Bzip2 to CPAN version 2.031

  [DELTA]

  2.031 21 September 2010

      * Updated to use bzip2 1.0.6

16 files changed, 59 insertions, 29 deletions

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index ea94d2b118..5c5f224427 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -316,7 +316,7 @@ use File::Glob qw(:case);
     'Compress::Raw::Bzip2' =>
 	{
 	'MAINTAINER'	=> 'pmqs',
-	'DISTRIBUTION'	=> 'PMQS/Compress-Raw-Bzip2-2.030.tar.gz',
+	'DISTRIBUTION'	=> 'PMQS/Compress-Raw-Bzip2-2.031.tar.gz',
 	'FILES'		=> q[cpan/Compress-Raw-Bzip2],
 	'EXCLUDED'	=> [ qr{^t/Test/},
 			     qw( bzip2-src/bzip2-cpp.patch
diff --git a/cpan/Compress-Raw-Bzip2/Changes b/cpan/Compress-Raw-Bzip2/Changes
index 696522413e..f266a796d6 100644
--- a/cpan/Compress-Raw-Bzip2/Changes
+++ b/cpan/Compress-Raw-Bzip2/Changes
@@ -1,6 +1,10 @@
 CHANGES
 -------
 
+  2.031 21 September 2010
+
+      * Updated to use bzip2 1.0.6
+
   2.030 22 July 2010
 
       * No Changes
diff --git a/cpan/Compress-Raw-Bzip2/README b/cpan/Compress-Raw-Bzip2/README
index a8a5c3bcef..bfc5502455 100644
--- a/cpan/Compress-Raw-Bzip2/README
+++ b/cpan/Compress-Raw-Bzip2/README
@@ -1,17 +1,17 @@
 
                              Compress-Raw-Bzip2
 
-                             Version 2.030
+                             Version 2.031
 
-                               22nd July 2010
+                               21st September 2010
 
        Copyright (c) 2005-2010 Paul Marquess. All rights reserved.
           This program is free software; you can redistribute it
            and/or modify it under the same terms as Perl itself.
 
              The directory bzip2-src contains a subset of the 
-          source files copied directly from bzip2 version 1.0.5.
-           These files are Copyright(C) 1996-2007 Julian Seward.
+          source files copied directly from bzip2 version 1.0.6.
+           These files are Copyright(C) 1996-2010 Julian Seward.
     See the file bzip2-src/LICENSE for licence details for these files.
              Full source for the bzip2 library is available at
                            http://www.bzip.org/
@@ -164,7 +164,7 @@ To help me help you, I need all of the following information:
         If you haven't installed Compress-Raw-Bzip2 then search Compress::Raw::Bzip2.pm
         for a line like this:
 
-          $VERSION = "2.030" ;
+          $VERSION = "2.031" ;
 
      c. The version of bzip2 you have used.
         If you have successfully installed Compress-Raw-Bzip2, this one-liner
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/LICENSE b/cpan/Compress-Raw-Bzip2/bzip2-src/LICENSE
index f420cffb67..cc614178cf 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/LICENSE
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/LICENSE
@@ -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 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Julian Seward, jseward@bzip.org
-bzip2/libbzip2 version 1.0.5 of 10 December 2007
+bzip2/libbzip2 version 1.0.6 of 6 September 2010
 
 --------------------------------------------------------------------------
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c b/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c
index bd2dec157f..d0d662cd4e 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c
@@ -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 <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.c b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.c
index c2d6f716b8..9a0b3b0043 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.c
@@ -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 <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.h b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.h
index c5b75d6d8f..8277123da8 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.h
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.h
@@ -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 <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h
index 23427879b1..5d0217f463 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h
@@ -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 <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    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;
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/compress.c b/cpan/Compress-Raw-Bzip2/bzip2-src/compress.c
index 8c80a07970..caf7696011 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/compress.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/compress.c
@@ -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 <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c b/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c
index 215687b2c0..1fea7e946c 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c
@@ -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 <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/decompress.c b/cpan/Compress-Raw-Bzip2/bzip2-src/decompress.c
index 97cfb70059..5441735e4f 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/decompress.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/decompress.c
@@ -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 <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
@@ -381,6 +381,13 @@ Int32 BZ2_decompress ( DState* s )
             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 @@ Int32 BZ2_decompress ( DState* s )
          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;
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/huffman.c b/cpan/Compress-Raw-Bzip2/bzip2-src/huffman.c
index 87e79e38af..2283fdbc5a 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/huffman.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/huffman.c
@@ -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 <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c b/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c
index 068b76367b..6d62459906 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c
@@ -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 <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
diff --git a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
index 8797075b70..c307e22ec4 100644
--- a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
+++ b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
@@ -12,7 +12,7 @@ use Carp ;
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
 
-$VERSION = '2.030';
+$VERSION = '2.031';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
diff --git a/cpan/Compress-Raw-Bzip2/t/000prereq.t b/cpan/Compress-Raw-Bzip2/t/000prereq.t
index a6c05bdb95..346c58769a 100644
--- a/cpan/Compress-Raw-Bzip2/t/000prereq.t
+++ b/cpan/Compress-Raw-Bzip2/t/000prereq.t
@@ -19,7 +19,7 @@ BEGIN
         if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
 
 
-    my $VERSION = '2.030';
+    my $VERSION = '2.031';
     my @NAMES = qw(
 			
 			);
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 975742e1f7..40658ef146 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -255,6 +255,12 @@ L<[perl #78082]|http://rt.perl.org/rt3//Public/Bug/Display.html?id=78082>
 
 =item *
 
+C<Compress::Raw::Bzip2> has been upgraded from version 2.030 to 2.031
+
+Updated to use bzip2 1.0.6
+
+=item *
+
 C<Data::Dumper> has been upgraded from version 2.128 to 2.129.
 
 C<Dumpxs> no longer crashes with globs returned by C<*$io_ref>