Date: Mon, 1 Jul 2013 06:26:49 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322117 - in head/mail: bogofilter bogofilter-sqlite bogofilter-tc bogofilter/files Message-ID: <201307010626.r616QnJX097961@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Mon Jul 1 06:26:49 2013 New Revision: 322117 URL: http://svnweb.freebsd.org/changeset/ports/322117 Log: Fix read-from-NULL-pointer crashes when command line option arguments are missing from long options --syslog-tag, --timestamp-date, or --db-cachesize (the short option equivalents were unaffected); or when BOGODIR/BOGOFILTER_HOME/HOME environment variables are all three missing when running bogotune. (This is all under the invoking user's control and not believed to be security relevant.) Reported by Alexandre Rebert, found within the Mayhem project he is with. Obtained from: http://svn.code.sf.net/p/bogofilter/code/trunk Added: head/mail/bogofilter/files/patch-SVNr6989 (contents, props changed) head/mail/bogofilter/files/patch-SVNr6990 (contents, props changed) head/mail/bogofilter/files/patch-SVNr6991 (contents, props changed) head/mail/bogofilter/files/patch-SVNr6993-minimal (contents, props changed) Modified: head/mail/bogofilter-sqlite/Makefile head/mail/bogofilter-tc/Makefile head/mail/bogofilter/Makefile Modified: head/mail/bogofilter-sqlite/Makefile ============================================================================== --- head/mail/bogofilter-sqlite/Makefile Mon Jul 1 06:15:06 2013 (r322116) +++ head/mail/bogofilter-sqlite/Makefile Mon Jul 1 06:26:49 2013 (r322117) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bogofilter -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail PKGNAMESUFFIX= -sqlite Modified: head/mail/bogofilter-tc/Makefile ============================================================================== --- head/mail/bogofilter-tc/Makefile Mon Jul 1 06:15:06 2013 (r322116) +++ head/mail/bogofilter-tc/Makefile Mon Jul 1 06:26:49 2013 (r322117) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bogofilter -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail PKGNAMESUFFIX= -tc Modified: head/mail/bogofilter/Makefile ============================================================================== --- head/mail/bogofilter/Makefile Mon Jul 1 06:15:06 2013 (r322116) +++ head/mail/bogofilter/Makefile Mon Jul 1 06:26:49 2013 (r322117) @@ -3,7 +3,7 @@ PORTNAME= bogofilter PORTVERSION= 1.2.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= mail MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION} Added: head/mail/bogofilter/files/patch-SVNr6989 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/bogofilter/files/patch-SVNr6989 Mon Jul 1 06:26:49 2013 (r322117) @@ -0,0 +1,11 @@ +--- src/bogoconfig.c (Revision 6988) ++++ src/bogoconfig.c (Revision 6989) +@@ -102,7 +102,7 @@ + LONGOPTIONS_DB + /* bogofilter specific options */ + { "classify-files", N, 0, 'B' }, +- { "syslog-tag", N, 0, 'L' }, ++ { "syslog-tag", R, 0, 'L' }, + { "classify-mbox", N, 0, 'M' }, + { "unregister-nonspam", N, 0, 'N' }, + { "dataframe", N, 0, 'R' }, Added: head/mail/bogofilter/files/patch-SVNr6990 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/bogofilter/files/patch-SVNr6990 Mon Jul 1 06:26:49 2013 (r322117) @@ -0,0 +1,14 @@ +--- src/bogotune.c (Revision 6989) ++++ src/bogotune.c (Revision 6990) +@@ -1852,6 +1852,11 @@ + if (ds_path == NULL) + ds_path = get_directory(PR_ENV_HOME); + ++ if (ds_path == NULL) { ++ fprintf(stderr, "Cannot derive bogofilter directory from environment, aborting.\n"); ++ exit(EX_ERROR); ++ } ++ + set_bogohome(ds_path); + bfp = bfpath_create(ds_path); + Added: head/mail/bogofilter/files/patch-SVNr6991 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/bogofilter/files/patch-SVNr6991 Mon Jul 1 06:26:49 2013 (r322117) @@ -0,0 +1,11 @@ +--- src/longoptions.h (Revision 6990) ++++ src/longoptions.h (Revision 6991) +@@ -133,7 +133,7 @@ + + #define LONGOPTIONS_DB \ + { "db-transaction", R, 0, O_DB_TRANSACTION }, \ +- { "timestamp-date", N, 0, 'y' }, \ ++ { "timestamp-date", R, 0, 'y' }, \ + lo1 lo2 + + #endif Added: head/mail/bogofilter/files/patch-SVNr6993-minimal ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/bogofilter/files/patch-SVNr6993-minimal Mon Jul 1 06:26:49 2013 (r322117) @@ -0,0 +1,11 @@ +--- src/bogoconfig.c (Revision 6992) ++++ src/bogoconfig.c (Revision 6993) +@@ -121,7 +121,7 @@ + { "debug-to-stdout", N, 0, 'D' }, + { "no-header-tags", N, 0, 'H' }, + { "query", N, 0, 'Q' }, +- { "db-cachesize", N, 0, 'k' }, ++ { "db-cachesize", R, 0, 'k' }, + { "ns-esf", R, 0, O_NS_ESF }, + { "sp-esf", R, 0, O_SP_ESF }, + { "ham-cutoff", R, 0, O_HAM_CUTOFF },
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307010626.r616QnJX097961>