Module Name: src
Committed By: msaitoh
Date: Wed Mar 13 11:29:57 UTC 2019
Modified Files:
src/external/bsd/bzip2/dist [netbsd-7-1]: bzip2recover.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.24.1 src/external/bsd/bzip2/dist/bzip2recover.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bzip2/dist/bzip2recover.c
diff -u src/external/bsd/bzip2/dist/bzip2recover.c:1.3 src/external/bsd/bzip2/dist/bzip2recover.c:1.3.24.1
--- src/external/bsd/bzip2/dist/bzip2recover.c:1.3 Mon May 7 00:45:47 2012
+++ src/external/bsd/bzip2/dist/bzip2recover.c Wed Mar 13 11:29:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bzip2recover.c,v 1.3 2012/05/07 00:45:47 wiz Exp $ */
+/* $NetBSD: bzip2recover.c,v 1.3.24.1 2019/03/13 11:29:57 msaitoh Exp $ */
/*-----------------------------------------------------------*/
/*--- Block recoverer program for bzip2 ---*/
@@ -472,6 +472,7 @@ Int32 main ( Int32 argc, Char** argv )
bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
bsPutUInt32 ( bsWr, blockCRC );
bsClose ( bsWr );
+ outFile = NULL;
}
if (wrBlock >= rbCtr) break;
wrBlock++;
