← Back to branch summary

~yolanda.robla/ubuntu/saucy/clamav/dep-8-tests

« back to all changes in this revision

Viewing changes to libclamav/filetypes.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2009-11-02 23:27:19 UTC
  • mfrom: (0.35.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091102232719-61ay35095dhbuxfm
Tags: 0.95.3+dfsg-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Drop build-dep on electric-fence (in Universe)
  - Build-dep on libltdl3-dev instead of libltdl-dev for updating earlier
    releases more easily
  - 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/filetypes.c
88
88
    { "CL_TYPE_ARJSFX",         CL_TYPE_ARJSFX          },
89
89
    { "CL_TYPE_NULSFT",         CL_TYPE_NULSFT          },
90
90
    { "CL_TYPE_AUTOIT",         CL_TYPE_AUTOIT          },
 
91
 
 
92
    /* for compatibility with daily.cvd < 9954 */
 
93
    { "CL_TYPE_CPIO_NEWC",      CL_TYPE_CPIO_NEWC       },
 
94
    { "CL_TYPE_CPIO_CRC",       CL_TYPE_CPIO_CRC        },
 
95
    { "CL_TYPE_CPIO_ODC",       CL_TYPE_CPIO_ODC        },
 
96
    { "CL_TYPE_CPIO_OLD",       CL_TYPE_CPIO_OLD        },
 
97
 
91
98
    { NULL,                     CL_TYPE_IGNORED         }
92
99
};
93
100
 
209
216
                             * However when detecting whether a file is HTML or not, we need exact conversion.
210
217
                             * (just eliminating zeros and matching would introduce false positives */
211
218
                            if(encoding_normalize_toascii(&in_area, encoding, &out_area) >= 0 && out_area.length > 0) {
212
 
                                    out_area.buffer[out_area.length] = '\0';
213
219
                                    if(cli_ac_initdata(&mdata, root->ac_partsigs, root->ac_lsigs, CLI_DEFAULT_AC_TRACKLEN))
214
220
                                            return ret;
215
221