- fix another ridiculous use-(one-line)-after-free

- install testbgpdump as well as bgpdump, the different output format
is a little easier on my eyes
This commit is contained in:
sthen 2010-09-08 14:08:10 +00:00
parent afd72e8781
commit 3337d7008f
3 changed files with 18 additions and 6 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2010/08/22 11:49:55 phessler Exp $
# $OpenBSD: Makefile,v 1.3 2010/09/08 14:08:10 sthen Exp $
COMMENT= library to analyze MRT-format BGP dump files
DISTNAME= libbgpdump-1.4.99.11
REVISION= 0
REVISION= 1
SHARED_LIBS= bgpdump 0.0
@ -30,6 +30,7 @@ NO_REGRESS= Yes
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/bgpdump ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKBUILD}/testbgpdump ${PREFIX}/bin
${INSTALL_DATA} ${WRKBUILD}/libbgpdump.* ${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include

View File

@ -1,9 +1,19 @@
$OpenBSD: patch-cfile_tools_c,v 1.1 2010/08/22 11:49:55 phessler Exp $
$OpenBSD: patch-cfile_tools_c,v 1.2 2010/09/08 14:08:10 sthen Exp $
Use after free
--- cfile_tools.c.orig Wed Apr 21 14:32:21 2010
+++ cfile_tools.c Wed Apr 21 14:32:58 2010
--- cfile_tools.c.orig Wed Nov 25 12:42:53 2009
+++ cfile_tools.c Wed Sep 8 15:05:25 2010
@@ -196,8 +196,8 @@ int cfr_close(CFRFILE *stream) {
case 1: // uncompressed
{
retval = fclose((FILE *)(stream->data1));
- free(stream);
stream->error1 = retval;
+ free(stream);
return(retval);
}
break;
@@ -218,8 +218,8 @@ int cfr_close(CFRFILE *stream) {
return(-1);
}

View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/08/17 19:48:36 sthen Exp $
@comment $OpenBSD: PLIST,v 1.2 2010/09/08 14:08:10 sthen Exp $
%%SHARED%%
@bin bin/bgpdump
@bin bin/testbgpdump
include/bgpdump-config.h
include/bgpdump.h
include/bgpdump_attr.h