diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-11-26 11:42:28 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-11-26 11:42:28 +0000 |
| commit | 89c6c06b8c42107dd231687a1012354e7d3039fc (patch) | |
| tree | dad94f4da8a6694f3cb99f7048be2f9cf5f78f97 /app-antivirus/clamav/files | |
| parent | 796cae72cf9ed18ba01256ac1f83a686a2a76036 (diff) | |
gentoo resync : 26.11.2017
Diffstat (limited to 'app-antivirus/clamav/files')
| -rw-r--r-- | app-antivirus/clamav/files/clamav-0.99.2-bytecode_api.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/app-antivirus/clamav/files/clamav-0.99.2-bytecode_api.patch b/app-antivirus/clamav/files/clamav-0.99.2-bytecode_api.patch new file mode 100644 index 000000000000..d6cd5264ed7d --- /dev/null +++ b/app-antivirus/clamav/files/clamav-0.99.2-bytecode_api.patch @@ -0,0 +1,50 @@ +Description: fix compatibility with zlib 1.2.9 and newer +Author: Marc Deslauriers <marc.deslauriers@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/clamav/+bug/1692073 + +--- a/libclamav/bytecode_api.c 2017-08-08 15:20:06.651685637 -0400 ++++ b/libclamav/bytecode_api.c 2017-08-15 15:45:14.645714766 -0400 +@@ -811,8 +811,20 @@ int32_t cli_bcapi_inflate_init(struct cl + 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"); +@@ -829,20 +841,6 @@ int32_t cli_bcapi_inflate_init(struct cl + cli_dbgmsg("bytecode api: inflateInit2: unknown error %d\n", ret); + 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; + } + |