libclamav/readdb.c: daily.ign was overwriting local.ign (bb#1265)

git-svn: trunk@4314
17 years ago · 6c0d168478
parent 5e035bdf9b
commit 6c0d168478
2 changed files with 7 additions and 7 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+Thu Oct 30 16:47:17 CET 2008 (tk)
+---------------------------------
+ * libclamav/readdb.c: daily.ign was overwriting local.ign (bb#1265)
+
 Thu Oct 30 13:52:42 CET 2008 (acab)
 -----------------------------------
 * libclamav/vba_extract.c: get_unicode_name off-by-one - bb#1239
--- a/libclamav/readdb.c
+++ b/libclamav/readdb.c
@ -1190,7 +1190,7 @@ static int cli_loadign(FILE *fs, struct cl_engine **engine, unsigned int options
 {
 	char buffer[FILEBUFF], *pt;
 	unsigned int line = 0;
-	struct cli_ignsig *new, *last = NULL;
+	struct cli_ignsig *new;
 	struct cli_ignored *ignored;
 	int ret;

@ -1244,12 +1244,8 @@ static int cli_loadign(FILE *fs, struct cl_engine **engine, unsigned int options
 	    break;
 	}

-	if(!last) {
-	    last = ignored->list = new;
-	} else {
-	    last->next = new;
-	    last = new;
-	}
+	new->next = ignored->list;
+	ignored->list = new;
    }

    if(ret) {