0963e86f43
that are always true due to char not being signed on this platform). This update fixes a possible crash, see http://sourceforge.net/project/shownotes.php?release_id=337279 for details.
24 lines
904 B
Plaintext
24 lines
904 B
Plaintext
--- libclamav/scanners.c.orig Thu Jun 23 22:03:12 2005
|
|
+++ libclamav/scanners.c Wed Jun 29 11:00:23 2005
|
|
@@ -642,11 +642,6 @@ static int cli_scangzip(int desc, const
|
|
|
|
#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, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)
|
|
{
|
|
@@ -667,7 +662,7 @@ static int cli_scanbzip(int desc, const
|
|
if(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;
|