@@ -1,3 +1,9 @@

+Fri Jan 18 12:13:16 CET 2008 (acab)

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

+  * test: Storing the testifles byteswapped to avoid detection of the tarball.

+  	  Real files are generated at make time and are additionally available

+	  under /contrib/test - close bb#398

+

 Thu Jan 17 21:38:58 CET 2008 (acab)

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

   * libclamav/nsis: use mmap if avail, prevent cli_malloc() spam if unavail,

@@ -16,8 +16,8 @@

 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

 #  MA 02110-1301, USA.

-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter

-EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file

+SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test

+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file

 bin_SCRIPTS=clamav-config

@@ -235,8 +235,8 @@ target_os = @target_os@

 target_vendor = @target_vendor@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter

-EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file

+SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test

+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.file

 bin_SCRIPTS = clamav-config

 pkgconfigdir = $(libdir)/pkgconfig

 pkgconfig_DATA = libclamav.pc

@@ -16788,7 +16788,7 @@ echo "$as_me: WARNING: Unable to determine FPU endianess, some features may not

 esac

-ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile libclamav/lzma/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1"

+ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile libclamav/lzma/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1"

 cat >confcache <<\_ACEOF

 # This file is a shell script that caches the results of configure

@@ -17418,6 +17418,7 @@ do

     "sigtool/Makefile") CONFIG_FILES="$CONFIG_FILES sigtool/Makefile" ;;

     "clamconf/Makefile") CONFIG_FILES="$CONFIG_FILES clamconf/Makefile" ;;

     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;

+    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;

     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

     "clamav-config") CONFIG_FILES="$CONFIG_FILES clamav-config" ;;

     "libclamav.pc") CONFIG_FILES="$CONFIG_FILES libclamav.pc" ;;

@@ -1345,6 +1345,7 @@ freshclam/Makefile

 sigtool/Makefile

 clamconf/Makefile

 etc/Makefile

+test/Makefile

 Makefile

 clamav-config

 libclamav.pc

new file mode 100644

@@ -0,0 +1,3 @@

+clam.exe is an extremely small (544 bytes!) MZ+PE executable that prints

+a nice message :-) You can use it to test attachment scanning in your ClamAV

+based mail scanner.

new file mode 100644

Binary files /dev/null and b/contrib/test/clam-v2.rar differ

new file mode 100644

Binary files /dev/null and b/contrib/test/clam-v3.rar differ

new file mode 100644

Binary files /dev/null and b/contrib/test/clam.cab differ

new file mode 100644

Binary files /dev/null and b/contrib/test/clam.exe differ

new file mode 100644

Binary files /dev/null and b/contrib/test/clam.exe.bz2 differ

new file mode 100644

Binary files /dev/null and b/contrib/test/clam.zip differ

new file mode 100644

@@ -0,0 +1,374 @@

+/*

+ *  Copyright (C) 2007 Nigel Horne <njh@bandsman.co.uk>

+ *

+ *  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

+ *  the Free Software Foundation; either version 2 of the License, or

+ *  (at your option) any later version.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

+ *  MA 02110-1301, USA.

+ *

+ * Compare the results of scanning files on a set of machines

+ *	This is useful for regression testing versions, and for testing

+ *	across different operating systems and architectures

+ * The file is always copied which is slow, and could be removed for regression

+ *	testing, if we have some mechanism to sync the data

+ */

+

+#include <stdio.h>

+#include <stdlib.h>

+#include <sys/types.h>

+#include <dirent.h>

+#include <sys/socket.h>

+#include <netinet/in.h>

+#include <arpa/inet.h>

+#include <netdb.h>

+#include <memory.h>

+#include <unistd.h>

+#include <pthread.h>

+#include <string.h>

+#include <signal.h>

+

+#define	PORT	3310

+#define	LEN	128

+

+/*

+ * Ensure you don't have StreamMaxLength on any of the servers, or that it's

+ *	big enough for all your samples

+ * Uses SESSIONS, which isn't good

+ * If localhost is one of them, it's probably best to put it last so that it

+ *	can be scanning while waiting for the remote machines to respond

+ */

+static struct machine {

+	const	char	*name;

+	in_addr_t	ip;

+	int	sock;

+} machines[] = {

+	{	"eric",		0,	-1	},

+	/*{	"motorola",	0,	-1	},*/

+	/*{	"ultra60",	0,	-1	},*/

+	{	"mac",		0,	-1	},

+	{	"localhost",	0,	-1	},

+	{	NULL,		0,	-1	}

+};

+

+struct args {

+	const	char	*filename;

+	const	struct	machine	*m;

+	char	*ret;

+};

+

+static	void	dir(const char *dirname);

+static	in_addr_t	resolve(const char *machine);

+static	int	start(in_addr_t ip);

+static	void	*scan(void *v);

+

+int

+main(int argc, char **argv)

+{

+	struct machine *m;

+

+	if(argc <= 1) {

+		fputs("Arg count\n", stderr);

+		return 1;

+	}

+

+	for(m = machines; m->name; m++) {

+		m->ip = resolve(m->name);

+

+		if(m->ip == INADDR_NONE) {

+			fprintf(stderr, "Can't resolve %s\n", m->name);

+			return 1;

+		}

+		m->sock = start(m->ip);

+		if(m->sock < 0)

+			fprintf(stderr, "%s is down\n", m->name);

+	}

+

+	signal(SIGPIPE, SIG_IGN);

+

+	while(*++argv)

+		dir(*argv);

+

+	return 0;

+}

+

+static void

+dir(const char *dirname)

+{

+	int i, nmachines;

+	const struct dirent *dirent;

+	struct machine *m;

+	DIR *d = opendir(dirname);

+	char **results;

+

+	if(d == NULL) {

+		perror(dirname);

+		return;

+	}

+	for(nmachines = 0, m = machines; m->name; m++)

+		if(m->sock >= 0)

+			nmachines++;

+

+	if(nmachines < 2) {

+		fputs("Needs at least 2 machines up to run\n", stderr);

+		closedir(d);

+		return;

+	}

+

+	results = (char **)malloc(nmachines * sizeof(char *));

+	if(results == NULL)

+		return;

+	for(i = 0, m = machines; m->name; m++)

+		if(m->sock >= 0) {

+			results[i] = malloc(LEN);

+			if(results[i++] == NULL) {

+				free(results);

+				closedir(d);

+				return;

+			}

+		}

+

+	if(i != nmachines) {

+		fputs("Failed sanity check\n", stderr);

+		closedir(d);

+		return;

+	}

+

+	while((dirent = readdir(d)) != NULL) {

+		int nthreads, founddiffs;

+		pthread_t *tids;

+		struct args *args;

+		char name[PATH_MAX];

+

+		if(dirent->d_ino == (ino_t)0)

+			continue;

+		if(dirent->d_name[0] == '.')

+			continue;

+

+		tids = malloc(nmachines * sizeof(pthread_t));

+		if(tids == NULL) {

+			free(results);

+			closedir(d);

+			return;

+		}

+		args = malloc(nmachines * sizeof(struct args));

+		if(args == NULL) {

+			free(tids);

+			free(results);

+			closedir(d);

+			return;

+		}

+

+		snprintf(name, sizeof(name) -1, "%s/%s", dirname, dirent->d_name);

+		for(nthreads = 0, m = machines; m->name; m++) {

+			if(m->sock < 0)

+				continue;

+

+			args[nthreads].filename = name;

+			args[nthreads].m = m;

+			args[nthreads].ret = results[nthreads];

+			pthread_create(&tids[nthreads], NULL, scan, &args[nthreads]);

+			nthreads++;

+		}

+		/*printf("Scanning %s\n", name);*/

+		founddiffs = 0;

+		while(--nthreads >= 0)

+			/* TODO: timeout */

+			pthread_join(tids[nthreads], NULL);

+

+		free(args);

+		free(tids);

+		for(i = 0; i <= nmachines - 2; i++) {

+			int j;

+

+			for(j = i + 1; j <= nmachines - 1; j++) {

+				const char *s, *t;

+

+				s = strchr(results[i], ' ');

+				t = strchr(results[j], ' ');

+				if((s == NULL) || (t == NULL) || (strcmp(s, t) != 0)) {

+					printf("%s:\n", name);

+					printf("\t%s: %s\n", machines[i].name, s ? s : "null");

+					printf("\t%s: %s\n", machines[j].name, t ? t : "null");

+					founddiffs = 1;

+				}

+			}

+		}

+

+		/*if(!founddiffs)

+			printf("%s passed\n", name);*/

+	}

+	closedir(d);

+}

+

+static in_addr_t

+resolve(const char *machine)

+{

+	in_addr_t ret = inet_addr(machine);

+

+	if(ret == INADDR_NONE) {

+		const struct hostent *h = gethostbyname(machine);

+

+		if(h == NULL) {

+			fprintf(stderr, "Unknown host %s\n", machine);

+			return INADDR_NONE;

+		}

+

+		memcpy((char *)&ret, h->h_addr, sizeof(in_addr_t));

+	}

+	return ret;

+}

+

+static int

+start(in_addr_t ip)

+{

+	int sock;

+	const struct protoent *proto;

+	struct sockaddr_in server;

+

+	memset((char *)&server, 0, sizeof(struct sockaddr_in));

+	server.sin_family = AF_INET;

+	server.sin_port = (in_port_t)htons(PORT);

+	server.sin_addr.s_addr = ip;

+

+	proto = getprotobyname("tcp");

+	if(proto == NULL) {

+		fputs("Unknown prototol tcp, check /etc/protocols\n", stderr);

+		return -1;

+	} else if((sock = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0) {

+		perror("socket");

+		return -1;

+	} else if(connect(sock, (struct sockaddr *)&server, sizeof(struct sockaddr_in)) < 0) {

+		perror("connect");

+		close(sock);

+		return -1;

+	} else if(send(sock, "SESSION\n", 8, 0) < 8) {

+		perror("send");

+		close(sock);

+		return -1;

+	}

+	return sock;

+}

+

+static void *

+scan(void *v)

+{

+	struct args *args;

+	FILE *fin;

+	int sock;

+	ssize_t nbytes;

+	size_t buflen;

+	in_port_t port;

+	struct sockaddr_in data;

+	const struct machine *m;

+	char buf[1024];	/* must be less than MTU */

+

+	args = (struct args *)v;

+	m = args->m;

+	if(m->sock < 0)

+		return NULL;

+	if(m->ip == htonl(INADDR_LOOPBACK)) {

+		char cmd[NAME_MAX + 7];

+

+		snprintf(cmd, sizeof(cmd) - 1, "SCAN %s\n", args->filename);

+		buflen = strlen(cmd);

+

+		if(send(m->sock, cmd, buflen, 0) != (ssize_t)buflen) {

+			perror(m->name);

+			return NULL;

+		}

+		nbytes = recv(m->sock, args->ret, LEN, 0);

+		if(nbytes < 0) {

+			perror(m->name);

+			return NULL;

+		}

+		args->ret[nbytes - 1] = '\0';	/* remove the trailing \n */

+

+		return NULL;

+	}

+	fin = fopen(args->filename, "r");

+	if(fin == NULL) {

+		perror(args->filename);

+		return NULL;

+	}

+	if(send(m->sock, "STREAM\n", 7, 0) != 7) {

+		perror(m->name);

+		fclose(fin);

+		return NULL;

+	}

+

+	if((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

+		perror("socket");

+		fputs("Failed to create TCPSocket to talk to clamd\n", stderr);

+		fclose(fin);

+		return NULL;

+	}

+

+	nbytes = recv(m->sock, buf, sizeof(buf), 0);

+	if(nbytes <= 0) {

+		perror(m->name);

+		close(sock);

+		fclose(fin);

+		return NULL;

+	}

+	buf[nbytes] = '\0';

+

+	if(sscanf(buf, "PORT %hu\n", &port) != 1) {

+		fprintf(stderr, "Expected port information from clamd, got '%s'",

+			buf);

+		close(sock);

+		fclose(fin);

+		return NULL;

+	}

+

+	memset((char *)&data, 0, sizeof(struct sockaddr_in));

+	data.sin_family = AF_INET;

+	data.sin_port = (in_port_t)htons(port);

+	data.sin_addr.s_addr = m->ip;

+

+	if(connect(sock, (struct sockaddr *)&data, sizeof(struct sockaddr_in)) < 0) {

+		perror(m->name);

+		fprintf(stderr, "Couldn't connect to port %d\n", port);

+		close(sock);

+		fclose(fin);

+		return NULL;

+	}

+

+	shutdown(sock, SHUT_RD);

+

+	while((buflen = fread(buf, 1, sizeof(buf), fin)) > 0) {

+		ssize_t sent = send(sock, buf, buflen, 0);

+

+		if(sent != (ssize_t)buflen) {

+			/* Probably hit scanstream len */

+			if(sent < 0)

+				perror(m->name);

+			else

+				fprintf(stderr, "%s: only sent %d bytes of %d to %s\n",

+					args->filename, sent, buflen, m->name);

+			break;

+		}

+	}

+

+	close(sock);

+	fclose(fin);

+

+	/* TODO: timeout */

+	nbytes = recv(m->sock, args->ret, LEN, 0);

+	if(nbytes < 0) {

+		perror(m->name);

+		return NULL;

+	}

+	args->ret[(nbytes) ? (nbytes - 1) : 0] = '\0';	/* remove the trailing \n */

+

+	return NULL;

+}

new file mode 100644

@@ -0,0 +1,313 @@

+/*

+ *  Copyright (C) 2006 Nigel Horne <njh@bandsman.co.uk>

+ *

+ *  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

+ *  the Free Software Foundation; either version 2 of the License, or

+ *  (at your option) any later version.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

+ *  MA 02110-1301, USA.

+ *

+ * $CC $CFLAGS -I../.. -I../../libclamav debugm.c -lclamav

+ * Now try a.out /sbin/* or a.out /usr/bin/*

+ *

+ * njh@bandsman.co.uk

+ */

+#include <stdio.h>

+#include <errno.h>

+#include <sys/stat.h>

+#include <sys/types.h>

+#include <fcntl.h>

+#include <malloc.h>

+#include <clamav.h>

+#include <sys/resource.h>

+#include <features.h>

+#include <unistd.h>

+#include <memory.h>

+#include <pthread.h>

+#include "clamav-config.h"

+#include "others.h"

+#include "mbox.h"

+#include "pdf.h"

+#include "binhex.h"

+#include "untar.h"

+#include "special.h"

+#include "tnef.h"

+#include "pst.h"

+#include "pe.h"

+

+struct args {

+	cli_ctx	ctx;

+	const	char	*filename;

+};

+

+static void *

+mbox(void *v)

+{

+	struct args *args = (struct args *)v;

+	int fd = open(args->filename, O_RDONLY);

+

+	if(fd < 0) {

+		perror(args->filename);

+		return NULL;

+	}

+	printf("cl_mbox(%s) returns %d\n",

+		args->filename, cli_mbox("/tmp/libclamav", fd, &args->ctx));

+	close(fd);

+

+	return NULL;

+}

+

+static void *

+pdf(void *v)

+{

+	struct args *args = (struct args *)v;

+	int fd = open(args->filename, O_RDONLY);

+

+	if(fd < 0) {

+		perror(args->filename);

+		return NULL;

+	}

+	printf("cl_pdf(%s) returns %d\n",

+		args->filename, cli_pdf("/tmp/libclamav", fd, &args->ctx));

+	close(fd);

+

+	return NULL;

+}

+

+static void *

+scandir(void *v)

+{

+	struct args *args = (struct args *)v;

+	int fd = open(args->filename, O_RDONLY);

+

+	if(fd < 0) {

+		perror(args->filename);

+		return NULL;

+	}

+	printf("cl_scandir(%s) returns %d\n",

+		args->filename, cli_scandir("/tmp/libclamav", &args->ctx));

+	close(fd);

+

+	return NULL;

+}

+

+static void *

+untar(void *v)

+{

+	struct args *args = (struct args *)v;

+	int fd = open(args->filename, O_RDONLY);

+

+	if(fd < 0) {

+		perror(args->filename);

+		return NULL;

+	}

+	printf("cl_untar(%s) returns %d\n",

+		args->filename, cli_untar("/tmp/libclamav", fd, 1));

+	close(fd);

+

+	return NULL;

+}

+

+static void *

+binhex(void *v)

+{

+	struct args *args = (struct args *)v;

+	int fd = open(args->filename, O_RDONLY);

+

+	if(fd < 0) {

+		perror(args->filename);

+		return NULL;

+	}

+	printf("cl_binhex(%s) returns %d\n",

+		args->filename, cli_binhex("/tmp/libclamav", fd));

+	close(fd);

+

+	return NULL;

+}

+

+static void *

+jpeg(void *v)

+{

+	struct args *args = (struct args *)v;

+	int fd = open(args->filename, O_RDONLY);

+

+	if(fd < 0) {

+		perror(args->filename);

+		return NULL;

+	}

+	printf("cli_check_jpeg_exploit(%s) returns %d\n",

+		args->filename, cli_check_jpeg_exploit(fd));

+	close(fd);

+

+	return NULL;

+}

+

+static void *

+tnef(void *v)

+{

+	struct args *args = (struct args *)v;

+	int fd = open(args->filename, O_RDONLY);

+

+	if(fd < 0) {

+		perror(args->filename);

+		return NULL;

+	}

+	printf("cli_tnef(%s) returns %d\n",

+		args->filename, cli_tnef("/tmp/libclamav", fd));

+	close(fd);

+

+	return NULL;

+}

+

+static void *

+uuencode(void *v)

+{

+	struct args *args = (struct args *)v;

+	int fd = open(args->filename, O_RDONLY);

+

+	if(fd < 0) {

+		perror(args->filename);

+		return NULL;

+	}

+	printf("cli_uuencode(%s) returns %d\n",

+		args->filename, cli_uuencode("/tmp/libclamav", fd));

+	close(fd);

+

+	return NULL;

+}

+

+static void *

+pst(void *v)

+{

+	struct args *args = (struct args *)v;

+	int fd = open(args->filename, O_RDONLY);

+

+	if(fd < 0) {

+		perror(args->filename);

+		return NULL;

+	}

+	printf("cli_pst(%s) returns %d\n",

+		args->filename, cli_pst("/tmp/libclamav", fd));

+	close(fd);

+

+	return NULL;

+}

+

+static void *

+pe(void *v)

+{

+	struct args *args = (struct args *)v;

+	int fd = open(args->filename, O_RDONLY);

+

+	if(fd < 0) {

+		perror(args->filename);

+		return NULL;

+	}

+	printf("cli_scanpe(%s) returns %d\n",

+		args->filename, cli_scanpe(fd, &args->ctx));

+	close(fd);

+

+	return NULL;

+}

+

+int

+main(int argc, char **argv)

+{

+	struct rlimit rlim;

+	const char *virname;

+	struct cl_engine engine;

+	struct cl_limits limits;

+	unsigned long scanned;

+	struct args args;

+

+	if(argc == 1) {

+		fprintf(stderr, "Usage: %s files...\n", argv[0]);

+		return 1;

+	}

+	rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;

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

+		perror("setrlimit");

+

+	if((mkdir("/tmp/libclamav", 0750) < 0) && (errno != EEXIST)) {

+		perror("/tmp/libclamav");

+		return errno;

+	}

+

+	memset(&args.ctx, '\0', sizeof(cli_ctx));

+	args.ctx.engine = &engine;

+	args.ctx.virname = &virname;

+	args.ctx.limits = &limits;

+	args.ctx.scanned = &scanned;

+	args.ctx.options = 0;

+

+	while(*++argv) {

+		pthread_t t;

+

+		args.filename = *argv;

+

+		if(pthread_create(&t, NULL, mbox, &args) != 0)

+			perror("pthread_create");

+		if(pthread_detach(t) != 0)

+			perror("pthread_detach");

+

+		if(pthread_create(&t, NULL, pdf, &args) != 0)

+			perror("pthread_create");

+		if(pthread_detach(t) != 0)

+			perror("pthread_detach");

+

+		if(pthread_create(&t, NULL, untar, &args) != 0)

+			perror("pthread_create");

+		if(pthread_detach(t) != 0)

+			perror("pthread_detach");

+

+		if(pthread_create(&t, NULL, binhex, &args) != 0)

+			perror("pthread_create");

+		if(pthread_detach(t) != 0)

+			perror("pthread_detach");

+

+		if(pthread_create(&t, NULL, jpeg, &args) != 0)

+			perror("pthread_create");

+		if(pthread_detach(t) != 0)

+			perror("pthread_detach");

+

+		if(pthread_create(&t, NULL, tnef, &args) != 0)

+			perror("pthread_create");

+		if(pthread_detach(t) != 0)

+			perror("pthread_detach");

+

+		if(pthread_create(&t, NULL, uuencode, &args) != 0)

+			perror("pthread_create");

+		if(pthread_detach(t) != 0)

+			perror("pthread_detach");

+

+		if(pthread_create(&t, NULL, pst, &args) != 0)

+			perror("pthread_create");

+		if(pthread_detach(t) != 0)

+			perror("pthread_detach");

+

+		if(pthread_create(&t, NULL, pe, &args) != 0)

+			perror("pthread_create");

+		if(pthread_detach(t) != 0)

+			perror("pthread_detach");

+

+		/* TODO: pass through all in cli_magic_scandesc */

+		if(pthread_create(&t, NULL, scandir, &args) != 0)

+			perror("pthread_create");

+		if(pthread_detach(t) != 0)

+			perror("pthread_detach");

+	}

+	puts("Hit SIGINT when all is finished");

+	pause();

+	puts("Finished - don't forget to rm -rf /tmp/libclamav");

+

+	return 0;

+}

new file mode 100644

@@ -0,0 +1,91 @@

+/*

+ * $CC $CFLAGS -I../.. debugm.c -lclamav -lefence (or what ever memory debugger)

+ * If you're going to use HAVE_BACKTRACE, ensure CFLAGS includes -g and doesn't

+ * include -fomit-frame-pointer

+ *

+ * njh@bandsman.co.uk

+ */

+#include <stdio.h>

+#include <errno.h>

+#include <sys/stat.h>

+#include <sys/types.h>

+#include <fcntl.h>

+#include <malloc.h>

+#include <clamav.h>

+#include <sys/resource.h>

+#include <signal.h>

+#include <features.h>

+#include "clamav-config.h"

+

+#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1

+/*#define HAVE_BACKTRACE	/* Only tested on Linux... */

+#endif

+

+#ifdef HAVE_BACKTRACE

+#include <execinfo.h>

+#endif

+

+static	void	print_trace(void);

+static	void	sigsegv(int sig);

+

+static void

+sigsegv(int sig)

+{

+	signal(SIGSEGV, SIG_DFL);

+	print_trace();

+	_exit(SIGSEGV);

+}

+

+static void

+print_trace(void)

+{

+#ifdef HAVE_BACKTRACE

+	void *array[10];

+	size_t size, i;

+	char **strings;

+

+	puts("Segfault caught, backtrace:");

+

+	size = backtrace(array, 10);

+	strings = backtrace_symbols(array, size);

+

+	for(i = 0; i < size; i++)

+		printf("\t%s\n", strings[i]);

+

+	free(strings);

+#endif

+}

+

+int

+main(int argc, char **argv)

+{

+	struct rlimit rlim;

+

+	if(argc == 1) {

+		fprintf(stderr, "Usage: %s files...\n", argv[0]);

+		return 1;

+	}

+	rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;

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

+		perror("setrlimit");

+

+	if(mkdir("/tmp/mboxtest", 0750) < 0) {

+		perror("/tmp/mboxtest");

+		return errno;

+	}

+	signal(SIGSEGV, sigsegv);

+	while(*++argv) {

+		int fd = open(*argv, 0);

+

+		if(fd < 0) {

+			perror(*argv);

+			return errno;

+		}