@@ -56,6 +56,7 @@ Ed Phillips <ed*UDel.Edu>

 Andreas Piesk <Andreas.Piesk*heise.de>

 Ant La Porte <ant*dvere.net>

 Thomas Quinot <thomas*cuivre.fr.eu.org>

+David Santinoli <david*santinoli.com>

 Matt Sullivan <matt*sullivan.gen.nz>

 Joe Talbott <josepht*cstone.net>

 Gernot Tenchio <g.tenchio*telco-tech.de>

@@ -1,3 +1,11 @@

+Sat Dec 20 13:25:23 CET 2003

+----------------------------------

+  * clamdscan: fixed a segmentation fault when invoked without arguments

+	       (patch by David Santinoli <david*santinoli.com>)

+  * libclamav: the memory limit and verbosity arguments in bzReadOpen() were

+	       swapped due to a bug in the bzip2 documentation (problem

+	       found by Tomasz Klim <tomek*euroneto.pl>, bzip2 author notified)

+

 Sun Dec 14 18:07:44 GMT 2003 (njh)

 ----------------------------------

   * libclamav: not all viruses were being found in embedded RFC822 messages

@@ -19,8 +19,6 @@

 #ifndef __CFGFILE_H

 #define __CFGFILE_H

-#include "options.h"

-

 #define LINE_LENGTH 1024

@@ -128,7 +128,9 @@ int client(const struct optstruct *opt)

     }

-    if(!strcmp(opt->filename, "-")) { /* scan data from stdin */

+    if(opt->filename == NULL || strlen(opt->filename) == 0) {

+	file = (char *) strdup(cwd);

+    } else if(!strcmp(opt->filename, "-")) { /* scan data from stdin */

 	if(write(sockd, "STREAM", 6) <= 0) {

 	    mprintf("@Can't write to the socket.\n");

 	    close(sockd);

@@ -196,8 +198,6 @@ int client(const struct optstruct *opt)

 	return claminfo.ifiles ? 1 : 0;

-    } else if(strlen(opt->filename) == 0) {

-	file = (char *) strdup(cwd);

     } else if(opt->filename[0] == '/') {

 	file = (char *) strdup(opt->filename);

     } else {

@@ -472,7 +472,7 @@ int cli_scanbzip(int desc, char **virname, long int *scanned, const struct cl_no

 	if(limits->archivememlim)

 	    memlim = 1;

-    if((bfd = BZ2_bzReadOpen(&bzerror, fs, memlim, 0, NULL, 0)) == NULL) {

+    if((bfd = BZ2_bzReadOpen(&bzerror, fs, 0, memlim, NULL, 0)) == NULL) {

 	cli_dbgmsg("Can't initialize bzip2 library (descriptor %d).\n", desc);

 	fclose(fs);

 	return CL_EBZIP;