... | ... |
@@ -1,3 +1,7 @@ |
1 |
+Thu Dec 1 15:07:49 CET 2011 (tk) |
|
2 |
+--------------------------------- |
|
3 |
+ * libclamav/readdb.c: allow comments in all db files (bb#3930) |
|
4 |
+ |
|
1 | 5 |
Tue Nov 22 19:07:47 CET 2011 (acab) |
2 | 6 |
----------------------------------- |
3 | 7 |
* libclamav/io9660.c: properly dump to temp file |
... | ... |
@@ -556,6 +556,8 @@ static int cli_loaddb(FILE *fs, struct cl_engine *engine, unsigned int *signo, u |
556 | 556 |
|
557 | 557 |
while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) { |
558 | 558 |
line++; |
559 |
+ if(buffer[0] == '#') |
|
560 |
+ continue; |
|
559 | 561 |
cli_chomp(buffer); |
560 | 562 |
if(engine->ignored) |
561 | 563 |
strcpy(buffer_cpy, buffer); |
... | ... |
@@ -902,6 +904,8 @@ static int cli_loadndb(FILE *fs, struct cl_engine *engine, unsigned int *signo, |
902 | 902 |
|
903 | 903 |
while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) { |
904 | 904 |
line++; |
905 |
+ if(buffer[0] == '#') |
|
906 |
+ continue; |
|
905 | 907 |
|
906 | 908 |
if(!phish) |
907 | 909 |
if(!strncmp(buffer, "HTML.Phishing", 13) || !strncmp(buffer, "Email.Phishing", 14)) |
... | ... |
@@ -1393,6 +1397,8 @@ static int cli_loadldb(FILE *fs, struct cl_engine *engine, unsigned int *signo, |
1393 | 1393 |
return CL_EMEM; |
1394 | 1394 |
while(cli_dbgets(buffer, sizeof(buffer), fs, dbio)) { |
1395 | 1395 |
line++; |
1396 |
+ if(buffer[0] == '#') |
|
1397 |
+ continue; |
|
1396 | 1398 |
sigs++; |
1397 | 1399 |
cli_chomp(buffer); |
1398 | 1400 |
|
... | ... |
@@ -1575,6 +1581,8 @@ static int cli_loadftm(FILE *fs, struct cl_engine *engine, unsigned int options, |
1575 | 1575 |
} else { |
1576 | 1576 |
if(!cli_dbgets(buffer, FILEBUFF, fs, dbio)) |
1577 | 1577 |
break; |
1578 |
+ if(buffer[0] == '#') |
|
1579 |
+ continue; |
|
1578 | 1580 |
cli_chomp(buffer); |
1579 | 1581 |
} |
1580 | 1582 |
line++; |
... | ... |
@@ -1812,6 +1820,8 @@ static int cli_loadign(FILE *fs, struct cl_engine *engine, unsigned int options, |
1812 | 1812 |
|
1813 | 1813 |
while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) { |
1814 | 1814 |
line++; |
1815 |
+ if(buffer[0] == '#') |
|
1816 |
+ continue; |
|
1815 | 1817 |
cli_chomp(buffer); |
1816 | 1818 |
|
1817 | 1819 |
tokens_count = cli_strtokenize(buffer, ':', IGN_MAX_TOKENS + 1, tokens); |
... | ... |
@@ -1901,6 +1911,8 @@ static int cli_loadhash(FILE *fs, struct cl_engine *engine, unsigned int *signo, |
1901 | 1901 |
|
1902 | 1902 |
while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) { |
1903 | 1903 |
line++; |
1904 |
+ if(buffer[0] == '#') |
|
1905 |
+ continue; |
|
1904 | 1906 |
cli_chomp(buffer); |
1905 | 1907 |
if(engine->ignored) |
1906 | 1908 |
strcpy(buffer_cpy, buffer); |