← Back to branch summary

~ubuntu-branches/ubuntu/saucy/clamav/saucy-backports

« back to all changes in this revision

Viewing changes to libclamav/cpio.c

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2014-07-15 01:08:10 UTC
  • mfrom: (0.35.47 sid)
  • Revision ID: package-import@ubuntu.com-20140715010810-ru66ek4fun2iseba
Tags: 0.98.4+dfsg-2~ubuntu13.10.1
https://launchpad.net/bugs/1341962
No-change backport to saucy (LP: #1341962)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/cpio.c
32
32
#include <sys/stat.h>
33
33
#include <fcntl.h>
34
34
 
 
35
#include <openssl/ssl.h>
 
36
#include <openssl/err.h>
 
37
#include "libclamav/crypto.h"
 
38
 
35
39
#include "cltypes.h"
36
40
#include "others.h"
37
41
#include "cpio.h"
157
161
            if(ret == CL_EMAXFILES) {
158
162
                return ret;
159
163
            } else if(ret == CL_SUCCESS) {
160
 
                ret = cli_map_scan(*ctx->fmap, pos, filesize, ctx);
 
164
                ret = cli_map_scan(*ctx->fmap, pos, filesize, ctx, CL_TYPE_ANY);
161
165
                if(ret == CL_VIRUS)
162
166
                    return ret;
163
167
            }
234
238
        if(ret == CL_EMAXFILES) {
235
239
            return ret;
236
240
        } else if(ret == CL_SUCCESS) {
237
 
            ret = cli_map_scan(*ctx->fmap, pos, filesize, ctx);
 
241
            ret = cli_map_scan(*ctx->fmap, pos, filesize, ctx, CL_TYPE_ANY);
238
242
            if(ret == CL_VIRUS)
239
243
                return ret;
240
244
        }
313
317
        if(ret == CL_EMAXFILES) {
314
318
            return ret;
315
319
        } else if(ret == CL_SUCCESS) {
316
 
            ret = cli_map_scan(*ctx->fmap, pos, filesize, ctx);
 
320
            ret = cli_map_scan(*ctx->fmap, pos, filesize, ctx, CL_TYPE_ANY);
317
321
            if(ret == CL_VIRUS)
318
322
                return ret;
319
323
        }