From 486fd3daf51ebce9af0abe224370f668e3e66d64 Mon Sep 17 00:00:00 2001 From: Tomasz Kojm Date: Wed, 17 Feb 2010 16:25:56 +0100 Subject: [PATCH] clean up some checks --- libclamav/readdb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libclamav/readdb.c b/libclamav/readdb.c index 9cdfc04a7..c2b4e2ab5 100644 --- a/libclamav/readdb.c +++ b/libclamav/readdb.c @@ -867,9 +867,6 @@ static int cli_loadndb(FILE *fs, struct cl_engine *engine, unsigned int *signo, while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) { line++; - if(!strncmp(buffer, "Exploit.JPEG.Comment", 20)) /* temporary */ - continue; - if(!phish) if(!strncmp(buffer, "HTML.Phishing", 13) || !strncmp(buffer, "Email.Phishing", 14)) continue; @@ -879,8 +876,7 @@ static int cli_loadndb(FILE *fs, struct cl_engine *engine, unsigned int *signo, strcpy(buffer_cpy, buffer); tokens_count = cli_strtokenize(buffer, ':', NDB_TOKENS + 1, tokens); - /* FIXME: re-enable after fixing invalid sig @ main.ndb:53467 */ - if(tokens_count < 4 /*|| tokens_count > 6*/) { + if(tokens_count < 4 || tokens_count > 6) { ret = CL_EMALFDB; break; }