← Back to branch summary

~ubuntu-branches/ubuntu/utopic/clamav/utopic-security

« back to all changes in this revision

Viewing changes to libclamav/phish_whitelist.c

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2014-02-01 11:06:17 UTC
  • mfrom: (0.35.37 sid)
  • Revision ID: package-import@ubuntu.com-20140201110617-33h2xxk09dep0ui4
Tags: 0.98.1+dfsg-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - Drop build-dep on electric-fence (in Universe)
  - Add apparmor profiles for clamd and freshclam along with maintainer
    script changes
  - Add autopkgtest

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/phish_whitelist.c
52
52
{
53
53
        if(engine) {
54
54
                engine->whitelist_matcher = (struct regex_matcher *) mpool_malloc(engine->mempool, sizeof(struct regex_matcher));
 
55
                if(!engine->whitelist_matcher) {
 
56
            cli_errmsg("Phish_whitelist: Unable to allocate memory for whitelist_match\n");
 
57
                        return CL_EMEM;
 
58
        }
55
59
#ifdef USE_MPOOL
56
60
                ((struct regex_matcher *)(engine->whitelist_matcher))->mempool = engine->mempool;
57
61
#endif
58
 
                if(!engine->whitelist_matcher)
59
 
                        return CL_EMEM;
60
62
                return  init_regex_list(engine->whitelist_matcher, engine->dconf->other&OTHER_CONF_PREFILTERING);
61
63
        }
62
64
        else