← Back to branch summary

~ubuntu-branches/ubuntu/feisty/clamav/feisty

« back to all changes in this revision

Viewing changes to libclamav/filetypes.c

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2007-02-20 10:33:44 UTC
  • mfrom: (0.7.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070220103344-yrxzd2x7lhee3r02
Tags: 0.90-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/clamav-base.init-stub, debian/clamav-daemon.init,
    debian/rules: init script stub for common setup functions.
  - debian/control: Maintainers updated for Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/filetypes.c
125
125
    /* Others */
126
126
 
127
127
    {0,  "\320\317\021\340\241\261\032\341", 8, "OLE2 container", CL_TYPE_MSOLE2},
128
 
    {0,  "\%PDF-",                       5, "PDF document", CL_TYPE_PDF},
 
128
    {0,  "%PDF-",                        5, "PDF document", CL_TYPE_PDF},
129
129
    {0,  "\266\271\254\256\376\377\377\377", 8, "CryptFF", CL_TYPE_CRYPTFF},
130
130
    {0,  "{\\rtf",                           5, "RTF", CL_TYPE_RTF}, 
131
131
 
136
136
    {0,  "OggS",                         4, "Ogg Stream",         CL_TYPE_DATA},
137
137
    {0,  "ID3",                          3, "MP3",                CL_TYPE_DATA},
138
138
    {0,  "\377\373\220",                 3, "MP3",                CL_TYPE_DATA},
139
 
    {0,  "\%!PS-Adobe-",                11, "PostScript",         CL_TYPE_DATA},
 
139
    {0,  "%!PS-Adobe-",                 11, "PostScript",         CL_TYPE_DATA},
140
140
    {0,  "\060\046\262\165\216\146\317", 7, "WMA/WMV/ASF",        CL_TYPE_DATA},
141
141
    {0,  ".RMF" ,                        4, "Real Media File",    CL_TYPE_DATA},
142
142
 
271
271
            if(cli_ac_initdata(&mdata, root->ac_partsigs, AC_DEFAULT_TRACKLEN))
272
272
                return ret;
273
273
 
274
 
            decoded = cli_utf16toascii(smallbuff, bread);
 
274
            decoded = (unsigned char *) cli_utf16toascii((char *) smallbuff, bread);
275
275
            if(decoded) {
276
 
                sret = cli_ac_scanbuff(decoded, strlen(decoded), NULL, engine->root[0], &mdata, 1, 0, 0, -1, NULL);
 
276
                sret = cli_ac_scanbuff(decoded, strlen((char *) decoded), NULL, engine->root[0], &mdata, 1, 0, 0, -1, NULL);
277
277
                free(decoded);
278
278
                if(sret == CL_TYPE_HTML)
279
279
                    ret = CL_TYPE_HTML_UTF16;
296
296
                        if(cli_ac_initdata(&mdata, root->ac_partsigs, AC_DEFAULT_TRACKLEN))
297
297
                            return ret;
298
298
 
299
 
                        decoded = (char*) encoding_norm_readline(&conv, NULL, &area, bread);
 
299
                        decoded =  encoding_norm_readline(&conv, NULL, &area, bread);
300
300
 
301
301
                        if(decoded) {
302
 
                            sret = cli_ac_scanbuff(decoded, strlen(decoded), NULL, engine->root[0], &mdata, 1, 0, 0, -1, NULL);
 
302
                            sret = cli_ac_scanbuff(decoded, strlen((const char *) decoded), NULL, engine->root[0], &mdata, 1, 0, 0, -1, NULL);
303
303
                            free(decoded);
304
304
                            if(sret == CL_TYPE_HTML) {
305
305
                                ret = CL_TYPE_HTML;