[src/netbsd-7]: src/external/bsd/bzip2/dist Pull up following revision(s) (re...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b872a81df672
branches:  netbsd-7
changeset: 449624:b872a81df672
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Mar 13 11:29:28 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #1684):
        external/bsd/bzip2/dist/bzip2recover.c: revision 1.4
Apply fix for CVE-2016-3189 bzip2: heap use after free in bzip2recover

diffstat:

 external/bsd/bzip2/dist/bzip2recover.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 490f6afea360 -r b872a81df672 external/bsd/bzip2/dist/bzip2recover.c
--- a/external/bsd/bzip2/dist/bzip2recover.c    Wed Mar 13 11:13:48 2019 +0000
+++ b/external/bsd/bzip2/dist/bzip2recover.c    Wed Mar 13 11:29:28 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bzip2recover.c,v 1.3 2012/05/07 00:45:47 wiz Exp $     */
+/*     $NetBSD: bzip2recover.c,v 1.3.14.1 2019/03/13 11:29:28 msaitoh Exp $    */
 
 /*-----------------------------------------------------------*/
 /*--- Block recoverer program for bzip2                   ---*/
@@ -472,6 +472,7 @@
             bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
             bsPutUInt32 ( bsWr, blockCRC );
             bsClose ( bsWr );
+            outFile = NULL;
          }
          if (wrBlock >= rbCtr) break;
          wrBlock++;