← Back to branch summary

~ubuntu-branches/ubuntu/precise/clamav/precise

« back to all changes in this revision

Viewing changes to libclamav/htmlnorm.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2011-06-18 11:56:34 UTC
  • mfrom: (0.35.21 sid)
  • Revision ID: james.westby@ubuntu.com-20110618115634-u2lovivet0qx34d0
Tags: 0.97.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

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/htmlnorm.c
625
625
        struct entity_conv conv;
626
626
        unsigned char entity_val[HTML_STR_LENGTH+1];
627
627
        size_t entity_val_length = 0;
628
 
        const int dconf_entconv = dconf && dconf->phishing&PHISHING_CONF_ENTCONV;
629
 
        const int dconf_js = dirname && dconf && dconf->doc&DOC_CONF_JSNORM; /* TODO */
 
628
        const int dconf_entconv = dconf ? dconf->phishing&PHISHING_CONF_ENTCONV : 1;
 
629
        const int dconf_js = dirname && (dconf ? dconf->doc&DOC_CONF_JSNORM : 1); /* TODO */
630
630
        /* dconf for phishing engine sets scanContents, so no need for a flag here */
631
631
        struct parser_state *js_state = NULL;
632
632
        const unsigned char *js_begin = NULL, *js_end = NULL;