← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/clamav/oneiric-updates

« back to all changes in this revision

Viewing changes to libclamav/pe_icons.c

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Seth Arnold, Scott Kitterman
  • Date: 2013-04-25 23:41:55 UTC
  • mfrom: (114.1.2 oneiric-security)
  • Revision ID: package-import@ubuntu.com-20130425234155-5e19oj23w5sm7n4v
Tags: 0.97.8+dfsg-1ubuntu1.11.10.1
https://launchpad.net/bugs/1172981
[ Seth Arnold ]
* SECURITY UPDATE: Updated to 0.97.8 to fix multiple security issues.
  - CVE-2013-2020 and CVE-2013-2021

[ Scott Kitterman ]
* Merge from Debian unstable (LP: #1172981).  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/pe_icons.c
38
38
#define LABDIFF(x) labdiff2(x)
39
39
#endif
40
40
 
 
41
/* #define LOGPARSEICONDETAILS */
 
42
 
41
43
struct GICONS {
42
44
    unsigned int cnt;
43
45
    uint32_t lastg;
1498
1500
        } else
1499
1501
            confidence = (color + (gray + bright + noedge)*2/3 + dark + edge + colors) / 6;
1500
1502
 
 
1503
#ifdef LOGPARSEICONDETAILS
1501
1504
        cli_dbgmsg("parseicon: edge confidence: %u%%\n", edge);
1502
1505
        cli_dbgmsg("parseicon: noedge confidence: %u%%\n", noedge);
1503
1506
        if(!bwmatch) {
1508
1511
        cli_dbgmsg("parseicon: dark confidence: %u%%\n", dark);
1509
1512
        if(!bwmatch)
1510
1513
            cli_dbgmsg("parseicon: spread confidence: red %u%%, green %u%%, blue %u%% - colors %u%%\n", reds, greens, blues, ccount);
 
1514
#endif
1511
1515
 
1512
1516
        if(confidence >= positivematch) {
1513
1517
            cli_dbgmsg("confidence: %u\n", confidence);