← Back to branch summary

~ubuntu-branches/ubuntu/wily/clamav/wily

« back to all changes in this revision

Viewing changes to libclamav/phish_domaincheck_db.c

  • Committer: Bazaar Package Importer
  • Author(s): Stephen Gran
  • Date: 2008-09-05 17:25:34 UTC
  • mfrom: (0.35.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080905172534-yi3f8fkye1o7u1r3
http://bugs.debian.org/497662
http://bugs.debian.org/497773
http://bugs.debian.org/496276
http://bugs.debian.org/491760
* New upstream version (closes: #497662, #497773)
  - lots of new options for clamd.conf
  - fixes CVEs CVE-2008-3912, CVE-2008-3913, CVE-2008-3914, and
    CVE-2008-1389
* No longer supports --unzip option, so typo is gone (closes: #496276)
* Translations:
  - sv (thanks Martin Bagge <brother@bsnet.se>) (closes: #491760)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/phish_domaincheck_db.c
49
49
{
50
50
        const char* info;
51
51
        int rc = engine->domainlist_matcher ? regex_list_match(engine->domainlist_matcher,real_url,display_url,hostOnly ? pre_fixup : NULL,hostOnly,&info,0) : 0;
52
 
        if(rc && info && info[0] && info[0] != ':') {/*match successful, and has custom flags*/
53
 
                if(strlen(info)==3 && isxdigit(info[0]) && isxdigit(info[1]) && isxdigit(info[2])) {
54
 
                        unsigned short notwantedflags=0;
55
 
                        sscanf(info,"%hx",&notwantedflags);
56
 
                        *flags &= ~notwantedflags;/* filter unwanted phishcheck flags */        
57
 
                }
58
 
                else {
59
 
                        cli_warnmsg("Phishcheck:Unknown flag format in domain-list, 3 hex digits expected");
60
 
                }
61
 
        }
62
52
        return rc;
63
53
}
64
54
 
79
69
        return (engine && engine->domainlist_matcher) ? is_regex_ok(engine->domainlist_matcher) : 1;
80
70
}
81
71
 
82
 
void domainlist_cleanup(const struct cl_engine* engine)
83
 
{
84
 
        if(engine && engine->domainlist_matcher) {
85
 
                regex_list_cleanup(engine->domainlist_matcher);
86
 
        }
87
 
}
88
 
 
89
72
void domainlist_done(struct cl_engine* engine)
90
73
{
91
74
        if(engine && engine->domainlist_matcher) {