mirror/clamav
1
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2026-02-23 18:36:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

11898 - fix unit test failure with zlib 1.2.9+. Patch provided by Marc Deslauriers.

Browse Source
This commit is contained in:
Steven Morgan
2017-08-18 16:06:26 -04:00
parent e09d884341
commit 48fef7b8ec
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libclamav/bytecode_api.c
View File

@@ -811,8 +811,19 @@ int32_t cli_bcapi_inflate_init(struct cli_bc_ctx *ctx, int32_t from, int32_t to,
cli_dbgmsg("bytecode api: inflate_init: invalid buffers!\n");
return -1;
}
memset(&stream, 0, sizeof(stream));
ret = inflateInit2(&stream, windowBits);
b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
if (!b) {
return -1;
}
ctx->inflates = b;
ctx->ninflates = n;
b = &b[n-1];
b->from = from;
b->to = to;
b->needSync = 0;
memset(&b->stream, 0, sizeof(stream));
ret = inflateInit2(&b->stream, windowBits);
switch (ret) {
case Z_MEM_ERROR:
cli_dbgmsg("bytecode api: inflateInit2: out of memory!\n");
@@ -830,19 +841,6 @@ int32_t cli_bcapi_inflate_init(struct cli_bc_ctx *ctx, int32_t from, int32_t to,
return -1;
}
b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
if (!b) {
inflateEnd(&stream);
return -1;
}
ctx->inflates = b;
ctx->ninflates = n;
b = &b[n-1];
b->from = from;
b->to = to;
b->needSync = 0;
memcpy(&b->stream, &stream, sizeof(stream));
return n-1;
}