@@ -28,3 +28,6 @@ pkgconfig_DATA = libclamav.pc

 # don't complain that configuration files and databases are not removed, this is intended

 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print

 DISTCLEANFILES = target.h

+

+lcov:

+	($(MAKE); cd unit_tests; $(MAKE) lcov)

@@ -789,6 +789,9 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA

 	tags tags-recursive uninstall uninstall-am \

 	uninstall-binSCRIPTS uninstall-pkgconfigDATA

+

+lcov:

+	($(MAKE); cd unit_tests; $(MAKE) lcov)

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

 .NOEXPORT:

@@ -43,3 +43,4 @@ endif

 LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@

 AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)

 EXTRA_DIST = clamav-milter.c INSTALL

+CLEANFILES=*.gcda *.gcno

@@ -251,6 +251,7 @@ top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_builddir)/docs/man/clamav-milter.8

 AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)

 EXTRA_DIST = clamav-milter.c INSTALL

+CLEANFILES = *.gcda *.gcno

 all: all-am

 .SUFFIXES:

@@ -584,6 +585,7 @@ install-strip:

 mostlyclean-generic:

 clean-generic:

+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:

 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

@@ -31,3 +31,4 @@ DEFS = @DEFS@ -DCL_NOTHREADS

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

+CLEANFILES=*.gcda *.gcno

@@ -233,6 +233,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 # it supports only --help

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamconf

+CLEANFILES = *.gcda *.gcno

 all: all-am

 .SUFFIXES:

@@ -491,6 +492,7 @@ install-strip:

 mostlyclean-generic:

 clean-generic:

+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:

 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

@@ -66,3 +66,4 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 # it does support --help and --version but with the default config file

 # it outputs an error message which tells us to edit the config files

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamd$(EXEEXT)

+CLEANFILES=*.gcda *.gcno

@@ -283,6 +283,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 # it does support --help and --version but with the default config file

 # it outputs an error message which tells us to edit the config files

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamd$(EXEEXT)

+CLEANFILES = *.gcda *.gcno

 all: all-am

 .SUFFIXES:

@@ -596,6 +597,7 @@ install-strip:

 mostlyclean-generic:

 clean-generic:

+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:

 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

@@ -43,3 +43,4 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I

 LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @FRESHCLAM_LIBS@

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamdscan$(EXEEXT)

+CLEANFILES=*.gcda *.gcno

@@ -247,6 +247,7 @@ top_srcdir = @top_srcdir@

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT)

+CLEANFILES = *.gcda *.gcno

 all: all-am

 .SUFFIXES:

@@ -536,6 +537,7 @@ install-strip:

 mostlyclean-generic:

 clean-generic:

+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:

 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

@@ -42,4 +42,4 @@ DEFS = @DEFS@ -DCL_NOTHREADS

 LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-

+CLEANFILES=*.gcda *.gcno

@@ -242,6 +242,7 @@ clamscan_SOURCES = \

     manager.h

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

+CLEANFILES = *.gcda *.gcno

 all: all-am

 .SUFFIXES:

@@ -532,6 +533,7 @@ install-strip:

 mostlyclean-generic:

 clean-generic:

+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:

 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

@@ -54,3 +54,4 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT)

+CLEANFILES=*.gcda *.gcno

@@ -257,6 +257,7 @@ freshclam_SOURCES = \

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT)

+CLEANFILES = *.gcda *.gcno

 all: all-am

 .SUFFIXES:

@@ -596,6 +597,7 @@ install-strip:

 mostlyclean-generic:

 clean-generic:

+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:

 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

@@ -241,7 +241,7 @@ noinst_LTLIBRARIES = libclamav_internal_utils.la

 EXTRA_DIST = regex/engine.c libclamav.map \

 	     jsparse/generated/operators.h jsparse/generated/keywords.h jsparse/future_reserved_words.list\

 	     jsparse/keywords.list jsparse/special_keywords.list jsparse/operators.gperf

-

+COMMON_CLEANFILES=version.h version.h.tmp *.gcda *.gcno lzma/*.gcda lzma/*.gcno

 if MAINTAINER_MODE

 BUILT_SOURCES=jsparse/generated/operators.h jsparse/generated/keywords.h jsparse-keywords.gperf

@@ -266,7 +266,7 @@ jsparse/generated/keywords.h: jsparse-keywords.gperf

 	rm keywords-tmp-g

 	mv keywords-tmp @srcdir@/jsparse/generated/keywords.h

-CLEANFILES=jsparse-keywords.gperf @srcdir@/jsparse/generated/operators.h @srcdir@/jsparse/generated/keywords.h

+CLEANFILES=$(COMMON_CLEANFILES) @srcdir@/jsparse/generated/operators.h @srcdir@/jsparse/generated/keywords.h

 else

-CLEANFILES=version.h version.h.tmp

+CLEANFILES=$(COMMON_CLEANFILES)

 endif

@@ -459,10 +459,11 @@ EXTRA_DIST = regex/engine.c libclamav.map \

 	     jsparse/generated/operators.h jsparse/generated/keywords.h jsparse/future_reserved_words.list\

 	     jsparse/keywords.list jsparse/special_keywords.list jsparse/operators.gperf

+COMMON_CLEANFILES = version.h version.h.tmp *.gcda *.gcno lzma/*.gcda lzma/*.gcno

 @MAINTAINER_MODE_TRUE@BUILT_SOURCES = jsparse/generated/operators.h jsparse/generated/keywords.h jsparse-keywords.gperf

 @MAINTAINER_MODE_TRUE@GPERF_FLAGS = -E -t -L ANSI-C -C -F ', TOK_ERROR' -c

-@MAINTAINER_MODE_FALSE@CLEANFILES = version.h version.h.tmp

-@MAINTAINER_MODE_TRUE@CLEANFILES = jsparse-keywords.gperf @srcdir@/jsparse/generated/operators.h @srcdir@/jsparse/generated/keywords.h

+@MAINTAINER_MODE_FALSE@CLEANFILES = $(COMMON_CLEANFILES)

+@MAINTAINER_MODE_TRUE@CLEANFILES = $(COMMON_CLEANFILES) @srcdir@/jsparse/generated/operators.h @srcdir@/jsparse/generated/keywords.h

 all: $(BUILT_SOURCES)

 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -64,7 +64,6 @@

  * <a href='mailto:somebody@yahoo.com'>to:somebody@yahoo.com</a>*/

 #define DOMAIN_LISTED		 8

 #define PHISHY_CLOAKED_NULL	16

-#define PHISHY_HEX_URL		32

 /*

 * Phishing design documentation,

@@ -814,9 +813,6 @@ int phishingScan(message* m,const char* dir,cli_ctx* ctx,tag_arguments_t* hrefs)

 			{

 				case CL_PHISH_CLEAN:

 					continue;

-				case CL_PHISH_HEX_URL:

-					*ctx->virname="Phishing.Heuristics.Email.HexURL";

-					break;

 				case CL_PHISH_NUMERIC_IP:

 					*ctx->virname="Phishing.Heuristics.Email.Cloaked.NumericIP";

 					break;

@@ -969,11 +965,11 @@ static const uint8_t URI_xalpha_nodot[256] = {

         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0

 };

-/*!"$%&'()*+,-0123456789@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz*/

+/*!"#$%&'()*+,-0123456789@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz*/

 static const uint8_t URI_xpalpha_nodot[256] = {

         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-        0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,

+        0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,

         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,

         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,

@@ -1164,19 +1160,6 @@ static enum phish_status phishy_map(int phishy,enum phish_status fallback)

 		return fallback;

 }

-static int isEncoded(const char* url)

-{

-	const char* start=url;

-	size_t cnt=0;

-	do{

-		cnt++;

-		start=strstr(start,"&#");

-		if(start)

-			start=strstr(start,";");

-	} while(start);

-	return (cnt-1 >strlen(url)*7/10);/*more than 70% made up of &#;*/

-}

-

 static int whitelist_check(const struct cl_engine* engine,struct url_check* urls,int hostOnly)

 {

 	return whitelist_match(engine,urls->realLink.data,urls->displayLink.data,hostOnly);

@@ -1220,7 +1203,7 @@ static int hash_match(const struct regex_matcher *rlist, const char *host, size_

 static int url_hash_match(const struct regex_matcher *rlist, const char *inurl, size_t len)

 {

 	char urlbuff[URL_MAX_LEN+3];/* htmlnorm truncates at 1024 bytes + terminating null + slash + host end null */

-	char *url;

+	char *url, *p;

 	const char *urlend = urlbuff + len;

 	char *host_begin;

 	size_t host_len, path_len;

@@ -1248,6 +1231,10 @@ static int url_hash_match(const struct regex_matcher *rlist, const char *inurl,

 	++host_begin;

 	while((host_begin < urlend) && *host_begin == '/') ++host_begin;

 	while(*host_begin == '.' && host_begin < urlend) ++host_begin;

+	p = strchr(host_begin, '@');

+	if(p)

+		host_begin = p+1;

+

 	host_len = strcspn(host_begin, ":/?");

 	path_begin = host_begin + host_len;

 	if(host_len < len) {

@@ -1275,21 +1262,24 @@ static int url_hash_match(const struct regex_matcher *rlist, const char *inurl,

 	lp[j] = host_begin;

 	pp[0] = path_len;

-	pp[1] = strcspn(path_begin, "?");

-	if(pp[1] != pp[0]) k = 2;

-	else k = 1;

-	pp[k++] = 0;

-	while(k < COMPONENTS+2) {

-		const char *p = strchr(path_begin + pp[k-1] + 1, '/');

-		if(p && p > path_begin) {

-			pp[k++] = p - path_begin;

-		} else

-			break;

-	}

+	if(path_len) {

+		pp[1] = strcspn(path_begin, "?");

+		if(pp[1] != pp[0]) k = 2;

+		else k = 1;

+		pp[k++] = 0;

+		while(k < COMPONENTS+2) {

+			const char *p = strchr(path_begin + pp[k-1] + 1, '/');

+			if(p && p > path_begin) {

+				pp[k++] = p - path_begin;

+			} else

+				break;

+		}

+	} else

+		k = 1;

 	for(ji=j;ji < COMPONENTS+1; ji++) {

 		for(ki=0;ki < k; ki++) {

-			assert(pp[ki] < path_len);

+			assert(pp[ki] <= path_len);

 			rc = hash_match(rlist, lp[ji], host_begin + host_len - lp[ji] + 1, path_begin, pp[ki]);

 			if(rc) {

 				return rc;

@@ -1372,10 +1362,6 @@ static enum phish_status phishingCheck(const struct cl_engine* engine,struct url

 			free_if_needed(&host_url);

 			return CL_PHISH_CLOAKED_NULL;

 		}

-		if(isEncoded(urls->displayLink.data)) {

-			free_if_needed(&host_url);

-			return CL_PHISH_HEX_URL;

-		}

 	}

 	if(urls->flags&CHECK_SSL && isSSL(urls->displayLink.data) && !isSSL(urls->realLink.data)) {

@@ -1430,8 +1416,6 @@ static const char* phishing_ret_toString(enum phish_status rc)

 			return "Visible links is SSL, real link is not";

 		case CL_PHISH_NOMATCH:

 			return "URLs are way too different";

-		case CL_PHISH_HEX_URL:

-			return "Embedded hex urls";

 		case CL_PHISH_HASH0:

 		case CL_PHISH_HASH1:

 		case CL_PHISH_HASH2:

@@ -65,7 +65,12 @@ struct node {

 static int build_suffixtree_descend(struct node *n, struct text_buffer *buf, suffix_callback cb, void *cbdata, struct regex_list *regex);

 /* -----------------*/

-static uint8_t dot_bitmap[32];

+static uint8_t dot_bitmap[32] = {

+	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,

+	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,

+	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,

+	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff

+};

 static struct node* make_node(enum node_type type, struct node *left, struct node *right)

 {

@@ -221,8 +226,8 @@ static uint8_t* parse_char_class(const char *pat, size_t *pos)

 			return dot_bitmap;

 		} else {

 			bitmap[pat[*pos]>>3] ^= 1<<(pat[*pos]&0x7);

-			++*pos;

 			range_start = pat[*pos];

+			++*pos;

 			hasprev = 1;

 		}

 	} while(pat[*pos]!=']');

@@ -286,12 +291,15 @@ static struct node* parse_regex(const char *p, size_t *last)

 				++*last;

 				break;

 			case '[':

+				++*last;

 				right = make_charclass( parse_char_class(p, last) );

 				if(!right)

 					return NULL;

 				v = make_node(concat, v, right);

 				if(!v)

 					return NULL;

+				++*last;

+				break;

 			case '\\':

 				/* next char is escaped, advance pointer

 				 * and let fall-through handle it */

@@ -312,7 +320,7 @@ static struct node* parse_regex(const char *p, size_t *last)

 static int build_suffixtree_ascend(struct node *n, struct text_buffer *buf, struct node *prev, suffix_callback cb, void *cbdata, struct regex_list *regex)

 {

-	size_t i;

+	size_t i, cnt;

 	while(n) {

 		struct node *q = n;

 		switch(n->type) {

@@ -326,12 +334,17 @@ static int build_suffixtree_ascend(struct node *n, struct text_buffer *buf, stru

 				n = n->parent;

 				break;

 			case leaf_class:

-				if(memcmp(n->u.leaf_class_bitmap, dot_bitmap, sizeof(dot_bitmap)) == 0) {

+				cnt = 0;

+				for(i=0;i<255;i++)

+					if (BITMAP_HASSET(n->u.leaf_class_bitmap, i))

+						cnt++;

+				if (cnt > 16) {

 					textbuffer_putc(buf, '\0');

 					if(cb(cbdata, buf->data, buf->pos-1, regex) < 0)

 						return CL_EMEM;

 					return 0;

 				}

+				/* handle small classes by expanding */

 				for(i=0;i<255;i++) {

 					if(BITMAP_HASSET(n->u.leaf_class_bitmap, i)) {

 						size_t pos;

@@ -2,7 +2,6 @@

 #include "clamav-config.h"

 #endif

 #include "version.h"

-#include <string.h>

 #ifndef REPO_VERSION

 #define REPO_VERSION VERSION

@@ -35,3 +35,4 @@ lib_LTLIBRARIES = libclamunrar.la

 endif

 EXTRA_DIST = libclamunrar.map

+CLEANFILES=*.gcda *.gcno

@@ -246,6 +246,7 @@ top_srcdir = @top_srcdir@

 @ENABLE_UNRAR_TRUE@lib_LTLIBRARIES = libclamunrar.la

 EXTRA_DIST = libclamunrar.map

+CLEANFILES = *.gcda *.gcno

 all: all-am

 .SUFFIXES:

@@ -448,6 +449,7 @@ install-strip:

 mostlyclean-generic:

 clean-generic:

+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:

 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

@@ -22,3 +22,4 @@ lib_LTLIBRARIES = libclamunrar_iface.la

 endif

 EXTRA_DIST = libclamunrar_iface.map

+CLEANFILES=*.gcda *.gcno

@@ -227,6 +227,7 @@ top_srcdir = @top_srcdir@

 @ENABLE_UNRAR_TRUE@lib_LTLIBRARIES = libclamunrar_iface.la

 EXTRA_DIST = libclamunrar_iface.map

+CLEANFILES = *.gcda *.gcno

 all: all-am

 .SUFFIXES:

@@ -422,6 +423,7 @@ install-strip:

 mostlyclean-generic:

 clean-generic:

+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:

 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

@@ -43,3 +43,4 @@ sigtool_SOURCES = \

 DEFS = @DEFS@ -DCL_NOTHREADS

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

+CLEANFILES=*.gcda *.gcno

@@ -245,6 +245,7 @@ sigtool_SOURCES = \

     sigtool.c

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

+CLEANFILES = *.gcda *.gcno

 all: all-am

 .SUFFIXES:

@@ -579,6 +580,7 @@ install-strip:

 mostlyclean-generic:

 clean-generic:

+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:

 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

@@ -26,7 +26,7 @@ check_clamscan.sh: $(top_builddir)/test/clam.exe

 $(top_builddir)/test/clam.exe:

 	(cd $(top_builddir)/test && $(MAKE))

-CLEANFILES=lcov.out *.gcno *.gcda *.log /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind.log clamdscan.log

+CLEANFILES=lcov.out *.gcno *.gcda *.log clamd-test.socket /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind.log clamdscan.log

 EXTRA_DIST=.split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh

 if ENABLE_COVERAGE

 LCOV_OUTPUT = lcov.out

@@ -227,7 +227,7 @@ scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh v

 check_clamav_SOURCES = check_clamav.c check_jsnorm.c check_str.c check_regex.c checks.h $(top_builddir)/libclamav/clamav.h check_disasm.c check_uniq.c

 check_clamav_CFLAGS = @CHECK_CFLAGS@ -DSRCDIR=\"$(abs_srcdir)\"

 check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@

-CLEANFILES = lcov.out *.gcno *.gcda *.log /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind.log clamdscan.log

+CLEANFILES = lcov.out *.gcno *.gcda *.log clamd-test.socket /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind.log clamdscan.log

 EXTRA_DIST = .split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh

 @ENABLE_COVERAGE_TRUE@LCOV_OUTPUT = lcov.out

 @ENABLE_COVERAGE_TRUE@LCOV_HTML = lcov_html

@@ -1,7 +1,7 @@

 #!/bin/sh 

 die() {

 	test -f /tmp/clamd-test.pid && kill `cat /tmp/clamd-test.pid` 

-	rm -rf test-db test-clamd-viraction.conf test-clamd.log test-clamd-heur-pred.conf

+	rm -rf test-db test-clamd-viraction.conf test-clamd.log	test-clamd-heur-pred.conf clamd-test.socket

 	exit $1

 }

 run_clamd_test() {

@@ -41,8 +41,9 @@ cat <$srcdir/test-clamd.conf >test-clamd-viraction.conf

 echo "VirusEvent `pwd`/$srcdir/virusaction-test.sh `pwd` \"Virus found: %v\"" >>test-clamd-viraction.conf

 rm -f test-clamd.log

 run_clamd_test test-clamd-viraction.conf ../test/clam.exe

-if ! grep "Virus found: ClamAV-Test-File.UNOFFICIAL" test-clamd.log >/dev/null 2>/dev/null; then

-	echo "Virusaction test failed!" >&2;

+grep "Virus found: ClamAV-Test-File.UNOFFICIAL" test-clamd.log >/dev/null 2>/dev/null; 

+if test ! $? ; then

+	echo "Virusaction test failed!" 

 	cat test-clamd.log

 	die 5;

 fi

@@ -50,14 +51,16 @@ fi

 # Test HeuristicScanPrecedence feature

 cat <$srcdir/test-clamd.conf >test-clamd-heur-pred.conf

 run_clamd_test test-clamd-heur-pred.conf clam-phish-exe

-if ! grep "ClamAV-Test-File" clamdscan.log >/dev/null 2>/dev/null; then

+grep "ClamAV-Test-File" clamdscan.log >/dev/null 2>/dev/null;

+if test ! $?; then

 	echo "HeuristicScanPrecedence off test failed!" >&2;

 	cat clamdscan.log;

 	die 6;

 fi

 echo "HeuristicScanPrecedence yes" >>test-clamd-heur-pred.conf

 run_clamd_test test-clamd-heur-pred.conf clam-phish-exe

-if ! grep "Phishing.Heuristics.Email.SpoofedDomain" clamdscan.log >/dev/null 2>/dev/null; then

+grep "Phishing.Heuristics.Email.SpoofedDomain" clamdscan.log >/dev/null 2>/dev/null;

+if test ! $?; then

 	echo "HeuristicScanPrecedence on test failed!" >&2;

 	cat clamdscan.log;

 	die 6;

@@ -376,6 +376,12 @@ static const char jstest_buf11[] =

 static const char jstest_expected11[] =

 "var n000=123456789;";

+static const char jstest_buf12[] =

+"var x='test\\u0000test';";

+

+static const char jstest_expected12[] =

+"var n000=\"test\x1test\";";

+

 static struct {

 	const char *in;

 	const char *expected;

@@ -391,7 +397,8 @@ static struct {

 	{jstest_buf8, jstest_expected8},

 	{jstest_buf9, jstest_expected9},

 	{jstest_buf10, jstest_expected10},

-	{jstest_buf11, jstest_expected11}

+	{jstest_buf11, jstest_expected11},

+	{jstest_buf12, jstest_expected12}

 };

 START_TEST (tokenizer_basic)

@@ -166,8 +166,12 @@ static const struct rtest {

 	const char *realurl;

 	const char *displayurl;

 	int result;/* 0 - phish, 1 - whitelisted, 2 - clean, 

-		      3 - blacklisted if 2nd db is loaded */

+		      3 - blacklisted if 2nd db is loaded,

+		      4 - invalid regex*/

 } rtests[] = {

+	{NULL,"http://fake.example.com","=====key.com",0},

+	{NULL,"http://key.com","=====key.com",2},

+	{NULL,"http://key.com@fake.example.com","key.com",0},

 	/* entry taken from .wdb with a / appended */

 	{".+\\.ebayrtm\\.com([/?].*)?:.+\\.ebay\\.(de|com|co\\.uk)([/?].*)?/",

 		"http://srx.main.ebayrtm.com",

@@ -188,7 +192,29 @@ static const struct rtest {

 	{NULL, "http://1.test.example.com/something","test",3},

 	{NULL, "http://1.test.example.com/2","test",3},

 	{NULL, "http://user@1.test.example.com/2","test",3},

-	{NULL, "http://x.exe","http:///x.exe",2}

+	{NULL, "http://user@1.test.example.com/2/test","test",3},

+	{NULL, "http://user@1.test.example.com/","test",3},

+	{NULL, "http://x.exe","http:///x.exe",2},

+	{".+\\.ebayrtm\\.com([/?].*)?:[^.]+\\.ebay\\.(de|com|co\\.uk)/",

+		"http://srx.main.ebayrtm.com",

+		"pages.ebay.de",

+		1 /* should be whitelisted */},

+	{".+\\.ebayrtm\\.com([/?].*)?:.+[r-t]\\.ebay\\.(de|com|co\\.uk)/",

+		"http://srx.main.ebayrtm.com",

+		"pages.ebay.de",

+		1 /* should be whitelisted */},

+	{".+\\.ebayrtm\\.com([/?].*)?:.+[r-t]\\.ebay\\.(de|com|co\\.uk)/",

+		"http://srx.main.ebayrtm.com",

+		"pages.ebay.de",

+		1 /* should be whitelisted */},

+	{"[t-","","",4},

+	{NULL,"http://co.uk","http:// co.uk",2},

+	{NULL,"http://co.uk","     ",2},

+	{NULL,"127.0.0.1","pages.ebay.de",2},

+	{".+\\.ebayrtm\\.com([/?].*)?:.+\\.ebay\\.(de|com|co\\.uk)([/?].*)?/",

+		"http://pages.ebay.de@fake.example.com","pages.ebay.de",0},

+	{NULL,"http://key.com","https://key.com",0},

+	{NULL,"http://key.com%00fake.example.com","https://key.com",0},

 };

 START_TEST (regex_list_match_test)

@@ -205,13 +231,18 @@ START_TEST (regex_list_match_test)

 		return;

 	}

-	fail_unless(rtest->result == 0 || rtest->result == 1,

-			"whitelist test result must be either 0 or 1");

+	fail_unless(rtest->result == 0 || rtest->result == 1 || rtest->result==4,

+			"whitelist test result must be either 0 or 1 or 4");

 	pattern = cli_strdup(rtest->pattern);

 	fail_unless(!!pattern, "cli_strdup");

 	rc = regex_list_add_pattern(&matcher, pattern);

-	fail_unless(rc == 0,"regex_list_add_pattern");

+	if(rtest->result == 4) {

+		fail_unless(rc, "regex_list_add_pattern should return error");

+		free(pattern);

+		return;

+	} else

+		fail_unless(rc == 0,"regex_list_add_pattern");

 	free(pattern);

 	matcher.list_loaded = 1;

@@ -110,6 +110,9 @@ START_TEST (test_append_len)

 {

 	fail_unless(textbuffer_append_len(&buf, "test",3) != -1, "tbuf append");

 	fail_unless(buf.data && !strncmp(buf.data,"tes",3), "textbuffer_append_len");

+	errmsg_expected();

+	fail_unless(textbuffer_append_len(&buf, "test",CLI_MAX_ALLOCATION) == -1, "tbuf append");

+	fail_unless(buf.data && !strncmp(buf.data,"tes",3), "textbuffer_append_len");

 }

 END_TEST