Stowage/clamav
2
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2025-10-19 18:33:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hwp: respect the len argument to the decompress_and_callback

Browse source
This commit is contained in:
Kevin Lin 2015-12-14 17:47:28 -05:00
parent 0361351cba
commit c09f95f480
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libclamav/hwp.c
View file

@ -59,12 +59,11 @@
#endif #endif
typedef int (*hwp_cb )(void *cbdata, int fd, cli_ctx *ctx); typedef int (*hwp_cb )(void *cbdata, int fd, cli_ctx *ctx);
/* TODO: respect len argument */
static int decompress_and_callback(cli_ctx *ctx, fmap_t *input, off_t at, size_t len, const char *parent, hwp_cb cb, void *cbdata) static int decompress_and_callback(cli_ctx *ctx, fmap_t *input, off_t at, size_t len, const char *parent, hwp_cb cb, void *cbdata)
{ {
int zret, ofd, ret = CL_SUCCESS; int zret, ofd, ret = CL_SUCCESS;
off_t off_in = at; off_t off_in = at;
size_t count, outsize = 0; size_t count, remain = 1, outsize = 0;
z_stream zstrm; z_stream zstrm;
char *tmpname; char *tmpname;
unsigned char inbuf[FILEBUFF], outbuf[FILEBUFF]; unsigned char inbuf[FILEBUFF], outbuf[FILEBUFF];
@ -72,6 +71,9 @@ static int decompress_and_callback(cli_ctx *ctx, fmap_t *input, off_t at, size_t
if (!ctx || !input || !cb) if (!ctx || !input || !cb)
return CL_ENULLARG; return CL_ENULLARG;
if (len)
remain = len;
/* reserve tempfile for output and callback */ /* reserve tempfile for output and callback */
if ((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd)) != CL_SUCCESS) { if ((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd)) != CL_SUCCESS) {
cli_errmsg("%s: Can't generate temporary file\n", parent); cli_errmsg("%s: Can't generate temporary file\n", parent);
@ -108,6 +110,11 @@ static int decompress_and_callback(cli_ctx *ctx, fmap_t *input, off_t at, size_t
if (!ret) if (!ret)
break; break;
if (len) {
if (remain < ret)
ret = remain;
remain -= ret;
}
zstrm.avail_in = ret; zstrm.avail_in = ret;
off_in += ret; off_in += ret;
} }
@ -126,7 +133,7 @@ static int decompress_and_callback(cli_ctx *ctx, fmap_t *input, off_t at, size_t
} }
zstrm.next_out = outbuf; zstrm.next_out = outbuf;
zstrm.avail_out = FILEBUFF; zstrm.avail_out = FILEBUFF;
} while(zret == Z_OK); } while(zret == Z_OK && remain);
/* post inflation checks */ /* post inflation checks */
if (zret != Z_STREAM_END && zret != Z_OK) { if (zret != Z_STREAM_END && zret != Z_OK) {
@ -138,6 +145,9 @@ static int decompress_and_callback(cli_ctx *ctx, fmap_t *input, off_t at, size_t
cli_infomsg(ctx, "%s: Error decompressing stream. Scanning what was decompressed.\n", parent); cli_infomsg(ctx, "%s: Error decompressing stream. Scanning what was decompressed.\n", parent);
} }
if (len && remain > 0)
cli_infomsg(ctx, "%s: Error decompressing stream. Not all requested input was converted\n", parent);
cli_dbgmsg("%s: Decompressed %llu bytes to %s\n", parent, (long long unsigned)outsize, tmpname); cli_dbgmsg("%s: Decompressed %llu bytes to %s\n", parent, (long long unsigned)outsize, tmpname);
/* scanning inflated stream */ /* scanning inflated stream */