@@ -1,27 +1,37 @@

 Tomasz Kojm <tkojm*clamav.net>

 home page : http://www.konarski.edu.pl/~zolw

 gpg key   : http://www.clamav.net/gpg/tkojm.gpg

-GPG = 0DCA 5A08 407D 5288 279D  B434 5482 2DC8 985A 444B

+GPG fingerprint = 0DCA 5A08 407D 5288 279D  B434 5482 2DC8 985A 444B

+Project leader.

 Nigel Horne <njh*clamav.net>

 home page : http://bandsman.co.uk

 Author of clamav-milter and the whole mbox code.

-System administrator (www, mailing lists, mirror issues, virus

-submission mechanisms): Luca 'NERvOus' Gibelli <nervous*clamav.net>

+Luca 'NERvOus' Gibelli <nervous*clamav.net>

+home page : http://www.nervous.it

+GPG fingerprint = C782 121E 8C3A 90E3 7A87  D802 6277 8FF4 5EFC 5582

+System administrator (WWW, mailing lists, mirror mechanism, virus

+submission mechanism)

 Submission management interface (for database developers only): Diego D'Ambra

 <diego*clamav.net>, Thomas Madsen <tm*softcom.dk>

-

 Database developers:

 aCaB <acab*clamav.net>

 Diego D'Ambra <diego*clamav.net>

 Jason Englander <jason*clamav.net>

 Tomasz Kojm <tkojm*clamav.net>

+

 Denis De Messemacker <ddm*clamav.net>

+gpg key   : http://www.clamav.net/gpg/ddm.gpg

+GPG fingerprint = E697 81BD A912 3F5A 737E  C254 B3B1 F81A 0278 7880

+

 Tomasz Papszun <tomek*clamav.net>

+gpg key	  : http://www.lodz.tpsa.pl/~tomek/pgp.txt

+GPG fingerprint = F115 0CA4 775D 9898 6F32  0F98 C0C2 2079 C1CA 59EE

+

 ClamAV logo: Mia Kalenius and Sergei Pronin <sp*finndesign.fi>

 TrashScan was written by Trashware <trashware*gmx.net>.

@@ -1,3 +1,10 @@

+Sun Jan 25 07:31:00 CET 2004 (tk)

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

+  * libclamav: VBA wrapper - fixed NULL dereference in new code (reported

+	       by Nigel)

+  * clamscan: fixed possible crash with uninitialized filename variable

+	      (thanks to Nigel)

+

 Sat Jan 24 18:17:51 GMT 2004 (njh)

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

   * clamav-milter: Allow clamd server name as well as IPaddress in -s option

@@ -57,7 +57,7 @@ int main(int argc, char **argv)

     if(setrlimit(RLIMIT_CORE, &rlim) < 0)

 	perror("setrlimit");

 #endif

-    opt=(struct optstruct*)mmalloc(sizeof(struct optstruct));

+    opt=(struct optstruct*)mcalloc(sizeof(struct optstruct));

     opt->optlist = NULL;

     opt->filename = NULL;

@@ -34,6 +34,7 @@

 #include "clamuko.h"

 #include "tests.h"

 #include "session.h"

+#include "../target.h"

 #ifdef CLAMUKO

 pthread_t clamukoid;

@@ -88,7 +88,7 @@ int main(int argc, char **argv)

     	};

-    opt=(struct optstruct*) mmalloc(sizeof(struct optstruct));

+    opt=(struct optstruct*) mcalloc(1, sizeof(struct optstruct));

     opt->optlist = NULL;

     while(1) {

@@ -42,7 +42,7 @@ Default: 1M

 \fBLogTime\fR

 Log time with each message.

 .br 

-Defayult: disabled.

+Default: disabled.

 .TP 

 \fBLogSyslog\fR

 Use system logger (can work together with LogFile).

@@ -59,7 +59,7 @@ int main(int argc, char **argv)

     	};

-    opt=(struct optstruct*)mmalloc(sizeof(struct optstruct));

+    opt=(struct optstruct*)mcalloc(sizeof(struct optstruct));

     opt->optlist = NULL;

     while(1) {

@@ -74,6 +74,7 @@ libclamav_la_SOURCES = \

 	ole2_extract.c \

 	ole2_extract.h \

 	vba_extract.c \

-	vba_extract.h

+	vba_extract.h \

+	cltypes.h

 lib_LTLIBRARIES = libclamav.la

@@ -173,7 +173,8 @@ libclamav_la_SOURCES = \

 	ole2_extract.c \

 	ole2_extract.h \

 	vba_extract.c \

-	vba_extract.h

+	vba_extract.h \

+	cltypes.h

 lib_LTLIBRARIES = libclamav.la

@@ -26,11 +26,12 @@

 #include <stdio.h>

 #include <string.h>

 #include <unistd.h>

-#include <stdint.h>

 #include <ctype.h>

 #include <stdlib.h>

 #include <clamav.h>

+#include "cltypes.h"

+

 #define FALSE (0)

 #define TRUE (1)

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2002, 2003 Tomasz Kojm <zolw@konarski.edu.pl>

+ *  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -29,8 +29,6 @@

 #  include <pthread.h>

 pthread_mutex_t cli_scanrar_mutex = PTHREAD_MUTEX_INITIALIZER;

 int cli_scanrar_inuse = 0;

-//pthread_mutex_t cli_mbox_mutex = PTHREAD_MUTEX_INITIALIZER;

-//int cli_mbox_inuse = 0;

 #endif

 #include "clamav.h"

@@ -596,16 +594,17 @@ int cli_scanole2(int desc, char **virname, long int *scanned, const struct cl_no

 		free(data);

 	    }

+	    for(i = 0; i < vba_project->count; i++)

+		free(vba_project->name[i]);

+	    free(vba_project->name);

+	    free(vba_project->dir);

+	    free(vba_project->offset);

+

 	} else {

 	    cli_errmsg("ScanOLE2 -> Can't decode VBA streams.\n");

 	    ret = CL_EOLE2;

 	}

-	for(i = 0; i < vba_project->count; i++)

-	    free(vba_project->name[i]);

-	free(vba_project->name);

-	free(vba_project->dir);

-	free(vba_project->offset);

 	cli_rmdirs(dir);

 	free(dir);

@@ -665,13 +664,6 @@ int cli_scanmail(int desc, char **virname, long int *scanned, const struct cl_no

     if(*reclev > 5) /* FIXME: a temporary workaround */

 	return CL_CLEAN;

-/*

-#ifdef CL_THREAD_SAFE

-    pthread_cleanup_push(cli_unlock_mutex, &cli_mbox_mutex);

-    pthread_mutex_lock(&cli_mbox_mutex);

-    cli_mbox_inuse = 1;

-#endif

-*/

     tmpdir = getenv("TMPDIR");

     if(tmpdir == NULL)

@@ -685,12 +677,6 @@ int cli_scanmail(int desc, char **virname, long int *scanned, const struct cl_no

 	dir = cl_gentemp(tmpdir);

 	if(mkdir(dir, 0700)) {

 	    cli_errmsg("ScanMail -> Can't create temporary directory %s\n", dir);

-/*

-#ifdef CL_THREAD_SAFE

-	    pthread_mutex_unlock(&cli_mbox_mutex);

-	    cli_mbox_inuse = 0;

-#endif

-*/

 	    return CL_ETMPDIR;

 	}

@@ -705,14 +691,6 @@ int cli_scanmail(int desc, char **virname, long int *scanned, const struct cl_no

 	cli_rmdirs(dir);

 	free(dir);

-/*

-#ifdef CL_THREAD_SAFE

-	pthread_mutex_unlock(&cli_mbox_mutex);

-        cli_mbox_inuse = 0;

-	pthread_cleanup_pop(0);

-#endif

-*/

-

 	return ret;

 }

@@ -1,5 +1,5 @@

 /*

- *  Extract VBA source code for component MS Office Documents)

+ *  Extract VBA source code for component MS Office Documents

  *

  *  Copyright (C) 2004 trog@uncon.org

  *

@@ -26,7 +26,6 @@

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <fcntl.h>

-#include <stdint.h>

 #include <stdlib.h>

 #include <ctype.h>

@@ -175,15 +174,18 @@ vba_project_t *vba56_dir_read(const char *dir)

 	unsigned char fixed_octet[8] = { 0x06, 0x02, 0x01, 0x00, 0x08, 0x02, 0x00, 0x00 };

+	cli_dbgmsg("in vba56_dir_read()\n");

+

 	fullname = (char *) cli_malloc(strlen(dir) + 14);

 	sprintf(fullname, "%s/_VBA_PROJECT", dir);

         fd = open(fullname, O_RDONLY);

-	free(fullname);

         if (fd == -1) {

-                cli_errmsg("Open failed\n");

+                cli_dbgmsg("Can't open %s\n", fullname);

+		free(fullname);

                 return NULL;

         }

+	free(fullname);

 	if (vba_readn(fd, &magic, 2) != 2) {

 		return NULL;

@@ -202,7 +204,7 @@ vba_project_t *vba56_dir_read(const char *dir)

 	}

 	if (i == NUM_VBA_VERSIONS) {

-		cli_errmsg("Unknown VBA version signature x0%x0x%x0x%x0x%x\n",

+		cli_dbgmsg("Unknown VBA version signature x0%x0x%x0x%x0x%x\n",

 			version[0], version[1], version[2], version[3]);

 		return NULL;

 	}

@@ -1,5 +1,5 @@

 /*

- *  Extract VBA source code for component MS Office Documents)

+ *  Extract VBA source code for component MS Office Documents

  *

  *  Copyright (C) 2004 trog@uncon.org

  *

@@ -23,10 +23,7 @@

 #ifndef __VBA_EXTRACT_H

 #define __VBA_EXTRACT_H

-#include <unistd.h>

-#include <sys/types.h>

-#include <stdint.h>

-#include <stdlib.h>

+#include "cltypes.h"

 typedef struct vba_project_tag {

 	int count;

@@ -70,7 +70,7 @@ int main(int argc, char **argv)

 	perror("setrlimit");

 #endif

-    opt=(struct optstruct*)mmalloc(sizeof(struct optstruct));

+    opt=(struct optstruct*)mcalloc(sizeof(struct optstruct));

     opt->optlist = NULL;

     while(1) {