@@ -2,4 +2,4 @@

 . $srcdir/check_common.sh

 init_valgrind

 WRAPPER="$VALGRIND $VALGRIND_FLAGS" test_clamd1 5

-end_valgrind

+end_valgrind 5

@@ -2,4 +2,4 @@

 . $srcdir/check_common.sh

 init_valgrind

 WRAPPER="$VALGRIND $VALGRIND_FLAGS" test_clamd2 6

-end_valgrind

+end_valgrind 6

@@ -3,4 +3,4 @@ exit 77

 . $srcdir/check_common.sh

 init_helgrind

 WRAPPER="$VALGRIND $VALGRIND_FLAGS_RACE" test_clamd1 7

-end_valgrind

+end_valgrind 7

@@ -2,4 +2,4 @@

 . $srcdir/check_common.sh

 init_helgrind

 WRAPPER="$VALGRIND $VALGRIND_FLAGS_RACE" test_clamd2 8

-end_valgrind

+end_valgrind 8

@@ -2,4 +2,4 @@

 . $srcdir/check_common.sh

 init_valgrind

 WRAPPER="$VALGRIND $VALGRIND_FLAGS" test_clamscan 9

-end_valgrind

+end_valgrind 9

@@ -107,6 +107,7 @@ test_run_check() {

 test_end() {

     killclamd

     cd ..

+    test -f test-$1/valgrind.log && mv -f test-$1/valgrind.log valgrind$1.log

     rm -rf test-$1

 }

@@ -137,10 +138,11 @@ init_helgrind() {

 }

 end_valgrind() {

-    NRUNS=`grep -a "ERROR SUMMARY" valgrind.log | wc -l`

-    if test $NRUNS -ne `grep -a "ERROR SUMMARY: 0 errors" valgrind.log | wc -l` || 

-	test `grep -a "FATAL:" valgrind.log|wc -l` -ne 0; then

-	cat valgrind.log

+    VLOG=valgrind$1.log

+    NRUNS=`grep -a "ERROR SUMMARY" $VLOG | wc -l`

+    if test $NRUNS -ne `grep -a "ERROR SUMMARY: 0 errors" $VLOG | wc -l` || 

+	test `grep -a "FATAL:" $VLOG|wc -l` -ne 0; then

+	cat $VLOG

 	die "Valgrind tests failed"

     fi

 }

@@ -365,7 +365,7 @@ static void do_phishing_test(const struct rtest *rtest)

 {

 	char *realurl;

 	cli_ctx ctx;

-	const char *virname;

+	const char *virname = NULL;

 	tag_arguments_t hrefs;

 	int rc;

@@ -417,8 +417,9 @@ static void do_phishing_test(const struct rtest *rtest)

 				fail_unless_fmt(ctx.found_possibly_unwanted,

 					"this should be blacklisted, realURL: %s, displayURL: %s",

 					rtest->realurl, rtest->displayurl);

-				fail_unless_fmt(!strstr((const char*)ctx.virname,"Blacklisted"),

-						"should be blacklisted, but is: %s\n", ctx.virname);

+				if (*ctx.virname)

+				    fail_unless_fmt(!strstr((const char*)*ctx.virname,"Blacklisted"),

+						    "should be blacklisted, but is: %s\n", ctx.virname);

 			}

 			break;

 	}