git-svn: trunk@4397
Tomasz Kojm authored on 2008/11/13 23:59:14... | ... |
@@ -1,3 +1,8 @@ |
1 |
+Thu Nov 13 14:59:39 CET 2008 (tk) |
|
2 |
+--------------------------------- |
|
3 |
+ * libclamav/readdb.c: phishing_done() no longer needs to be called outside |
|
4 |
+ cl_engine_free() |
|
5 |
+ |
|
1 | 6 |
Thu Nov 13 11:05:20 EET 2008 (edwin) |
2 | 7 |
------------------------------------ |
3 | 8 |
* libclamav/htmlnorm.c: fix memory leak (bb #1291) |
... | ... |
@@ -484,13 +484,11 @@ static int cli_loadwdb(FILE *fs, struct cl_engine *engine, unsigned int options, |
484 | 484 |
|
485 | 485 |
if(!engine->whitelist_matcher) { |
486 | 486 |
if((ret = init_whitelist(engine))) { |
487 |
- phishing_done(engine); |
|
488 | 487 |
return ret; |
489 | 488 |
} |
490 | 489 |
} |
491 | 490 |
|
492 | 491 |
if((ret = load_regex_matcher(engine->whitelist_matcher, fs, options, 1, dbio))) { |
493 |
- phishing_done(engine); |
|
494 | 492 |
return ret; |
495 | 493 |
} |
496 | 494 |
|
... | ... |
@@ -507,13 +505,11 @@ static int cli_loadpdb(FILE *fs, struct cl_engine *engine, unsigned int options, |
507 | 507 |
|
508 | 508 |
if(!engine->domainlist_matcher) { |
509 | 509 |
if((ret = init_domainlist(engine))) { |
510 |
- phishing_done(engine); |
|
511 | 510 |
return ret; |
512 | 511 |
} |
513 | 512 |
} |
514 | 513 |
|
515 | 514 |
if((ret = load_regex_matcher(engine->domainlist_matcher, fs, options, 0, dbio))) { |
516 |
- phishing_done(engine); |
|
517 | 515 |
return ret; |
518 | 516 |
} |
519 | 517 |
|