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

+Sun Aug 27 10:52:55 BST 2006 (njh)

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

+  * libclamav/blob.c:	Don't use % in filenames on Windows, since cmd.exe

+				uses that to start environment variables

+			Reported by Nico <tbb*hideout.ath.cx>

+

 Sat Aug 26 23:41:08 CEST 2006 (tk)

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

   * libclamav/mspack: fix double close of file descriptor, patch from NJH

@@ -16,7 +16,7 @@

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

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: blob.c,v 1.52 2006/07/25 15:09:45 njh Exp $";

+static	char	const	rcsid[] = "$Id: blob.c,v 1.53 2006/08/27 09:51:31 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -24,6 +24,7 @@ static	char	const	rcsid[] = "$Id: blob.c,v 1.52 2006/07/25 15:09:45 njh Exp $";

 #ifdef	C_WINDOWS

 #include "stdafx.h"

+#include <io.h>

 #endif

 #include <stdio.h>

@@ -32,11 +33,7 @@ static	char	const	rcsid[] = "$Id: blob.c,v 1.52 2006/07/25 15:09:45 njh Exp $";

 #include <errno.h>

 #include <fcntl.h>

-#ifdef	C_WINDOWS

-#include <io.h>

-#endif

-

-#if	HAVE_SYS_PARAM_H

+#ifdef	HAVE_SYS_PARAM_H

 #include <sys/param.h>	/* for NAME_MAX */

 #endif

@@ -420,7 +417,7 @@ fileblobSetFilename(fileblob *fb, const char *dir, const char *filename)

 	 */

 	snprintf(fullname, sizeof(fullname), "%s/clamavtmpXXXXXXXXXXXXX", dir);

 #elif	defined(C_WINDOWS)

-	sprintf_s(fullname, sizeof(fullname) - 1, "%s/%.*sXXXXXX", dir,

+	sprintf_s(fullname, sizeof(fullname) - 1, "%s\\%.*sXXXXXX", dir,

 		(int)(sizeof(fullname) - 9 - strlen(dir)), filename);

 #else

 	sprintf(fullname, "%s/%.*sXXXXXX", dir,

@@ -441,16 +438,18 @@ fileblobSetFilename(fileblob *fb, const char *dir, const char *filename)

 	}

 #elif	defined(C_WINDOWS)

 	cli_dbgmsg("fileblobSetFilename: _mktemp_s(%s)\n", fullname);

-	fd = _mktemp_s(fullname, sizeof(fullname));

-	if((fd < 0) && (errno == EINVAL)) {

-		/*

-		 * This happens with some Linux flavours when (mis)handling

-		 * filenames with foreign characters

-		 */

-		sprintf_s(fullname, sizeof(fullname), "%s/clamavtmpXXXXXXXXXXXXX", dir);

-		cli_dbgmsg("fileblobSetFilename: retry as mkstemp(%s)\n", fullname);

-		fd = _mktemp_s(fullname, sizeof(fullname));

-	}

+	if(_mktemp_s(fullname, strlen(fullname) + 1) != 0) {

+		char *name;

+		

+		/* _mktemp_s only allows 26 files */

+		cli_dbgmsg("fileblobSetFilename: _mktemp_s(%s) failed: %s\n", fullname, strerror(errno));

+		name = cli_gentemp(dir);

+		if(name == NULL)

+			return;

+		fd = open(name, O_WRONLY|O_CREAT|O_EXCL|O_TRUNC|O_BINARY, 0600);

+		free(name);

+	} else

+		fd = open(fullname, O_WRONLY|O_CREAT|O_EXCL|O_TRUNC|O_BINARY, 0600);

 #else

 	cli_dbgmsg("fileblobSetFilename: mktemp(%s)\n", fullname);

 	(void)mktemp(fullname);

@@ -497,7 +496,7 @@ fileblobAddData(fileblob *fb, const unsigned char *data, size_t len)

 			if(fb->ctx->scanned)

 				*fb->ctx->scanned += (unsigned long)len / CL_COUNT_PRECISION;

-			if((len > 5) && (cli_scanbuff((char *)data, len, fb->ctx->virname, fb->ctx->engine, 0) == CL_VIRUS)) {

+			if((len > 5) && (cli_scanbuff((char *)data, (unsigned int)len, fb->ctx->virname, fb->ctx->engine, 0) == CL_VIRUS)) {

 				cli_dbgmsg("fileblobAddData: found %s\n", *fb->ctx->virname);

 				fb->isInfected = 1;

 			}

@@ -545,7 +544,7 @@ sanitiseName(char *name)

 #endif

 		/* Also check for tab - "Heinz Martin" <Martin@hemag.ch> */

 #if	defined(MSDOS) || defined(C_CYGWIN) || defined(WIN32) || defined(C_OS2)

-		if(strchr("/*?<>|\\\"+=,;:\t ", *name))

+		if(strchr("%/*?<>|\\\"+=,;:\t ", *name))

 #else

 		if(*name == '/')

 #endif