From a622f5f35318b1ace4ad438c3056dfdcc3d845db Mon Sep 17 00:00:00 2001 From: aCaB Date: Tue, 29 Apr 2008 17:54:01 +0000 Subject: [PATCH] bb#990 git-svn: trunk@3824 --- ChangeLog | 4 ++++ libclamav/unzip.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f63c499b..3302b194b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Apr 29 18:53:51 CEST 2008 (acab) +------------------------------------ + * libclamav/unzip.c: check for unprefixed bz2 - bb#990 + Tue Apr 29 15:04:11 CEST 2008 (acab) ------------------------------------ * doc/man/freshclam.1.in: english typo - thanks Stephen Gran diff --git a/libclamav/unzip.c b/libclamav/unzip.c index 56925b9bb..88bff2e89 100644 --- a/libclamav/unzip.c +++ b/libclamav/unzip.c @@ -178,9 +178,9 @@ static int unz(uint8_t *src, uint32_t csize, uint32_t usize, uint16_t method, ui #if HAVE_BZLIB_H #ifdef NOBZ2PREFIX -#define BZ2_bzReadOpen bzReadOpen -#define BZ2_bzReadClose bzReadClose -#define BZ2_bzRead bzRead +#define BZ2_bzDecompress bzDecompress +#define BZ2_bzDecompressEnd bzDecompressEnd +#define BZ2_bzDecompressInit bzDecompressInit #endif case ALG_BZIP2: {