fa0e2fef8f
least one highly critical (remote). See http://secunia.com/advisories/29000 for details. Thanks to kurt@ for helping analyzing the threaded code issues.
24 lines
776 B
Plaintext
24 lines
776 B
Plaintext
--- libclamav/scanners.c.orig Wed Apr 2 22:53:44 2008
|
|
+++ libclamav/scanners.c Mon Apr 14 18:41:12 2008
|
|
@@ -529,11 +529,6 @@ static int cli_scangzip(int desc, cli_ctx *ctx)
|
|
|
|
#ifdef HAVE_BZLIB_H
|
|
|
|
-#ifdef NOBZ2PREFIX
|
|
-#define BZ2_bzReadOpen bzReadOpen
|
|
-#define BZ2_bzReadClose bzReadClose
|
|
-#define BZ2_bzRead bzRead
|
|
-#endif
|
|
|
|
static int cli_scanbzip(int desc, cli_ctx *ctx)
|
|
{
|
|
@@ -555,7 +550,7 @@ static int cli_scanbzip(int desc, cli_ctx *ctx)
|
|
if(ctx->limits->archivememlim)
|
|
memlim = 1;
|
|
|
|
- if((bfd = BZ2_bzReadOpen(&bzerror, fs, 0, memlim, NULL, 0)) == NULL) {
|
|
+ if((bfd = (BZFILE *)BZ2_bzReadOpen(&bzerror, fs, 0, memlim, NULL, 0)) == NULL) {
|
|
cli_dbgmsg("Bzip: Can't initialize bzip2 library (descriptor: %d).\n", desc);
|
|
fclose(fs);
|
|
return CL_EBZIP;
|