@@ -7,7 +7,8 @@ $(FILES) :

 	cat $(SPLIT_DIR)/split.$@aa $(SPLIT_DIR)/split.$@ab > $@

 programs = check_clamav

-scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh valgrind_tests.sh

+scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh\

+	 valgrind_tests.sh efence_tests.sh duma_tests.sh

 TESTS = $(programs) $(scripts)

 check_PROGRAMS = $(programs)

 check_SCRIPTS = $(scripts)

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

 $(top_builddir)/test/clam.exe:

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

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

-EXTRA_DIST=.split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts)

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

+EXTRA_DIST=.split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts)/preload_run.sh

 if ENABLE_COVERAGE

 LCOV_OUTPUT = lcov.out

 LCOV_HTML = lcov_html

@@ -228,13 +228,15 @@ top_srcdir = @top_srcdir@

 SPLIT_DIR = $(top_srcdir)/unit_tests/.split

 FILES = clam-phish-exe

 programs = check_clamav

-scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh valgrind_tests.sh

+scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh\

+	 valgrind_tests.sh efence_tests.sh duma_tests.sh

+

 check_SCRIPTS = $(scripts)

 @HAVE_LIBCHECK_FALSE@check_clamav_SOURCES = check_clamav_skip.c

 @HAVE_LIBCHECK_TRUE@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_matchers.c

 @HAVE_LIBCHECK_TRUE@check_clamav_CPPFLAGS = @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\"

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

-CLEANFILES = lcov.out *.gcno *.gcda *.log clamd-test.socket /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 clamdscan-multiscan.log duma.log

 EXTRA_DIST = .split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts)

 @ENABLE_COVERAGE_TRUE@LCOV_OUTPUT = lcov.out

 @ENABLE_COVERAGE_TRUE@LCOV_HTML = lcov_html

@@ -1,14 +1,20 @@

-#!/bin/sh  

+#!/bin/sh 

 CLAMD_WRAPPER=${CLAMD_WRAPPER-}

 killclamd() {

 	test -f /tmp/clamd-test.pid || return

-	pid=`cat /tmp/clamd-test.pid`

-	kill -0 $pid && kill $pid

+	pid=`cat /tmp/clamd-test.pid 2>/dev/null`

+	if test "X$pid" = "X"; then

+		# file can be removed between the 'test' and 'cat',

+		# it happened a few times for me

+		return

+	fi

+	kill -0 $pid 2>/dev/null || return

+	kill $pid

 	timeout=10

-	(sleep $timeout; kill -KILL $pid) &

+	(sleep $timeout && kill -0 $pid 2>/dev/null && kill -KILL $pid) &

 	sleeperpid=$!

 	wait $pid

-	kill -ALRM $sleeperpid 2>/dev/null

+	kill $sleeperpid 2>/dev/null

 	rm -f /tmp/clamd-test.pid

 }

 die() {

@@ -1,4 +1,5 @@

 #!/bin/sh

+CLAMSCAN_WRAPPER=${CLAMSCAN_WRAPPER-}

 die() {

 	rm -rf test-db

 	exit $1;

@@ -8,7 +9,7 @@ cat <<EOF >test-db/test.hdb

 aa15bcf478d165efd2065190eb473bcb:544:ClamAV-Test-File

 EOF

 rm -f clamscan.log

-../clamscan/clamscan --quiet -dtest-db/test.hdb ../test/clam* --log=clamscan.log

+../libtool --mode=execute $CLAMSCAN_WRAPPER ../clamscan/clamscan --quiet -dtest-db/test.hdb ../test/clam* --log=clamscan.log

 if test $? != 1; then

 	echo "Error running clamscan: $?" >&2;

 	grep OK clamscan.log >&2;

new file mode 100755

@@ -0,0 +1,35 @@

+#!/bin/sh

+# Run under duma

+for i in $LIBDUMA /usr/lib/libduma.so /usr/local/lib/libduma.so; do

+	if test -f "$i"; then

+		LIBDUMA="$i"

+		break;

+	fi

+done

+test -f "$LIBDUMA" || { echo "*** duma not found, skipping test"; exit 77;}

+DUMA_FILL=90

+DUMA_MALLOC_0_STRATEGY=1

+DUMA_OUTPUT_FILE=duma.log

+DUMA_DISABLE_BANNER=1

+LIBPRELOAD="$LIBDUMA"

+rm -f duma.log

+export DUMA_FILL DUMA_MALLOC_0_STRATEGY DUMA_OUTPUT_FILE DUMA_DISABLE_BANNER LIBPRELOAD

+echo "--- running clamd under duma to detect underruns"

+CLAMD_WRAPPER=$srcdir/preload_run.sh $srcdir/check_clamd.sh

+if test ! $?; then

+	echo "*** DUMA has detected errors"

+	cat duma.log

+	exit 3

+fi

+DUMA_PROTECT_BELOW=1

+export DUMA_PROTECT_BELOW

+echo "--- running clamd under duma to detect underruns"

+rm -f duma.log

+CLAMD_WRAPPER=$srcdir/preload_run.sh $srcdir/check_clamd.sh

+if test ! $?; then

+	echo "*** DUMA has detected errors"

+	cat duma.log

+	exit 3

+fi

+rm -f duma.log

+

new file mode 100755

@@ -0,0 +1,39 @@

+#!/bin/sh

+# Run under electric-fence

+for i in $LIBEFENCE /usr/lib/libefence.so /usr/local/lib/libefence.so /opt/csw/lib/libefence.so; do

+	if test -f "$i"; then

+		LIBEFENCE="$i"

+		break;

+	fi

+done

+test -f "$LIBEFENCE" || { echo "*** electric-fence not found, skipping test"; exit 77;}

+

+EF_FREE_WIPES=1

+LIBPRELOAD="$LIBEFENCE"

+export EF_FREE_WIPES LIBPRELOAD

+VALGRIND=`which ${VALGRIND-valgrind}`

+if test ! -n "$VALGRIND" -o ! -x "$VALGRIND"; then

+	# run check_clamav under efence only if we don't have valgrind installed

+	echo "--- Running check_clamav under electric-fence"

+	CK_FORK=no ../libtool --mode=execute $srcdir/preload_run.sh ./check_clamav

+	if test ! $?; then

+		echo "*** Electric-fence has detected errors"

+		exit 1

+	fi

+fi

+# we don't run clamd under electric-fence, it always crashes in free(),

+# probably doesn't work well with libpthread.

+echo "--- running clamscan under electric-fence to detect overruns"

+CLAMSCAN_WRAPPER=$srcdir/preload_run.sh $srcdir/check_clamscan.sh

+if test ! $?; then

+	echo "*** Electric-fence has detected errors"

+	exit 2

+fi

+EF_PROTECT_BELOW=1

+export EF_PROTECT_BELOW

+echo "--- running clamscan under electric-fence to detect underruns"

+CLAMSCAN_WRAPPER=$srcdir/preload_run.sh $srcdir/check_clamscan.sh

+if test ! $?; then

+	echo "*** Electric-fence has detected errors"

+	exit 3

+fi

new file mode 100755

@@ -0,0 +1,8 @@

+#!/bin/sh

+# Helper script to run a program under electric-fence / duma

+

+# prevent core dumps

+ulimit -c 0

+LD_PRELOAD=$LIBPRELOAD

+export LD_PRELOAD

+exec $@