← Back to branch summary

~ubuntu-branches/ubuntu/dapper/clamav/dapper

« back to all changes in this revision

Viewing changes to libclamav/ole2_extract.c

  • Committer: Bazaar Package Importer
  • Author(s): Stephen Gran
  • Date: 2006-01-10 02:55:18 UTC
  • mto: This revision was merged to the branch mainline in revision 5.
  • Revision ID: james.westby@ubuntu.com-20060110025518-92bhgfe911byl3bc
Tags: upstream-0.88
Import upstream version 0.88

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/ole2_extract.c
195
195
                cli_dbgmsg("[err name len: %d]\n", property->name_size);
196
196
                return;
197
197
        }
198
 
        print_property_name(property->name, property->name_size);
 
198
        print_property_name((char *) property->name, property->name_size);
199
199
        switch (property->type) {
200
200
        case 2:
201
201
                cli_dbgmsg(" [file] ");
463
463
{
464
464
        property_t prop_block[4];
465
465
        int32_t index, current_block, i;
466
 
        unsigned char *dirname;
 
466
        char *dirname;
467
467
        current_block = hdr->prop_start;
468
468
        
469
469
        if ((prop_index < 0) || (rec_level > 100) || (*file_count > 100000)) {
594
594
                return FALSE;
595
595
        }
596
596
 
597
 
        if (! (name = get_property_name(prop->name, prop->name_size))) {
 
597
        if (! (name = get_property_name((char *)prop->name, prop->name_size))) {
598
598
                /* File without a name - create a name for it */
599
599
                off_t i;
600
600
                                                                                                                            
809
809
                return CL_EOLE2;
810
810
        }
811
811
 
812
 
        if (strncmp(hdr.magic, magic_id, 8) != 0) {
 
812
        if (strncmp((char *) hdr.magic, (char *) magic_id, 8) != 0) {
813
813
                cli_dbgmsg("OLE2 magic failed!\n");
814
814
#ifdef HAVE_MMAP
815
815
                if (hdr.m_area != NULL) {