@@ -1,3 +1,8 @@

+Thu Feb 14 15:33:22 CET 2008 (acab)

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

+  * libclamav/untar: OTF scan

+  * libclamav/pdf: create RW tempfiles

+

 Thu Feb 14 02:53:28 CET 2008 (acab)

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

   * libclamav/nsis: revert Nullsoft-bastardized zlibs

@@ -58,6 +58,10 @@ static	char	const	rcsid[] = "$Id: pdf.c,v 1.61 2007/02/12 20:46:09 njh Exp $";

 #include "pdf.h"

 #include "scanners.h"

+#ifndef	O_BINARY

+#define	O_BINARY	0

+#endif

+

 #ifdef	CL_DEBUG

 /*#define	SAVE_TMP	/* Save the file being worked on in tmp */

 #endif

@@ -369,28 +373,8 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx)

 			has_cr = 1;

 		} else

 			has_cr = 0;

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

-#if	defined(C_LINUX) || defined(C_BSD) || defined(HAVE_MKSTEMP) || defined(C_SOLARIS) || defined(C_CYGWIN)

-		fout = mkstemp(fullname);

-#elif	defined(C_WINDOWS)

-		if(_mktemp(fullname) == NULL) {

-			/* mktemp only allows 26 files */

-			char *name = cli_gentemp(dir);

-			if(name == NULL)

-				fout = -1;

-			else {

-				strcpy(fullname, name);

-				free(name);

-				fout = open(fullname,

-					O_WRONLY|O_CREAT|O_EXCL|O_TRUNC|O_BINARY, 0600);

-			}

-		} else

-			fout = open(fullname, O_WRONLY|O_CREAT|O_EXCL|O_TRUNC|O_BINARY, 0600);

-#else

-		mktemp(fullname);

-		fout = open(fullname, O_WRONLY|O_CREAT|O_EXCL|O_TRUNC|O_BINARY, 0600);

-#endif

-

+		snprintf(fullname, sizeof(fullname), "%s/pdf%02u", dir, files);

+		fout = open(fullname, O_RDWR|O_CREAT|O_EXCL|O_TRUNC|O_BINARY, 0600);

 		if(fout < 0) {

 			cli_errmsg("cli_pdf: can't create temporary file %s: %s\n", fullname, strerror(errno));

 			rc = CL_ETMPFILE;

@@ -490,7 +474,7 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx)

 		}

 		if (rc == CL_CLEAN) {

-			cli_dbgmsg("cli_pdf: extracted file %u to %s\n", ++files, fullname);

+			cli_dbgmsg("cli_pdf: extracted file %u to %s\n", files++, fullname);

 			lseek(fout, 0, SEEK_SET);

 			md5digest = cli_md5digest(fout);

@@ -1152,10 +1152,7 @@ static int cli_scantar(int desc, cli_ctx *ctx, unsigned int posix)

 	return CL_ETMPDIR;

     }

-    if((ret = cli_untar(dir, desc, posix, ctx)))

-	cli_dbgmsg("Tar: %s\n", cl_strerror(ret));

-    else

-	ret = cli_scandir(dir, ctx, 0);

+    ret = cli_untar(dir, desc, posix, ctx);

     if(!cli_leavetemps_flag)

 	cli_rmdirs(dir);

@@ -63,13 +63,12 @@ octal(const char *str)

 int

 cli_untar(const char *dir, int desc, unsigned int posix, cli_ctx *ctx)

 {

-	int size = 0, ret;

+	int size = 0, ret, fout=-1;

 	int in_block = 0;

 	unsigned int files = 0;

 	char fullname[NAME_MAX + 1];

-	FILE *outfile = NULL;

-	cli_dbgmsg("In untar(%s, %d)\n", dir ? dir : "", desc);

+	cli_dbgmsg("In untar(%s, %d)\n", dir, desc);

 	for(;;) {

 		char block[BLOCKSIZE];

@@ -79,26 +78,27 @@ cli_untar(const char *dir, int desc, unsigned int posix, cli_ctx *ctx)

 			break;

 		if(nread < 0) {

-			if(outfile)

-				fclose(outfile);

+			if(fout>=0)

+				close(fout);

 			cli_errmsg("cli_untar: block read error\n");

 			return CL_EIO;

 		}

 		if(!in_block) {

 			char type;

-			const char *suffix;

-			size_t suffixLen = 0;

-			int fd, directory, skipEntry = 0;

+			int directory, skipEntry = 0;

 			char magic[7], name[101], osize[13];

-			if(outfile) {

-				if(fclose(outfile)) {

-					cli_errmsg("cli_untar: cannot close file %s\n",

-						fullname);

-					return CL_EIO;

-				}

-				outfile = (FILE*)0;

+			if(fout>=0) {

+				int ret;

+				lseek(fout, 0, SEEK_SET);

+				ret = cli_magic_scandesc(fout, ctx);

+				close(fout);

+				if (!cli_leavetemps_flag)

+					unlink(fullname);

+				if (ret==CL_VIRUS)

+					return CL_VIRUS;

+				fout = -1;

 			}

 			if(block[0] == '\0')	/* We're done */

@@ -168,9 +168,9 @@ cli_untar(const char *dir, int desc, unsigned int posix, cli_ctx *ctx)

 			size = octal(osize);

 			if(size < 0) {

 				cli_errmsg("Invalid size in tar header\n");

-				if(outfile)

-					fclose(outfile);

-				return CL_EFORMAT;

+				if(fout)

+					close(fout);

+				return CL_CLEAN;

 			}

 			cli_dbgmsg("cli_untar: size = %d\n", size);

 			if((ret=cli_checklimits("cli_untar", ctx, size, 0, 0))!=CL_CLEAN) {

@@ -187,59 +187,26 @@ cli_untar(const char *dir, int desc, unsigned int posix, cli_ctx *ctx)

 			strncpy(name, block, 100);

 			name[100] = '\0';

+			snprintf(fullname, sizeof(fullname)-1, "%s/tar%02u", dir, files);

+			fullname[sizeof(fullname)-1] = '\0';

+			fout = open(fullname, O_RDWR|O_CREAT|O_EXCL|O_TRUNC|O_BINARY, 0600);

-			/*

-			 * see also fileblobSetFilename()

-			 * TODO: check if the suffix needs to be put back

-			 */

-			sanitiseName(name);

-			suffix = strrchr(name, '.');

-			if(suffix == NULL)

-				suffix = "";

-			else {

-				suffixLen = strlen(suffix);

-				if(suffixLen > 4) {

-					/* Found a full stop which isn't a suffix */

-					suffix = "";

-					suffixLen = 0;

-				}

-			}

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

-				(int)(sizeof(fullname) - 9 - suffixLen - strlen(dir)), name);

-#if	defined(C_LINUX) || defined(C_BSD) || defined(HAVE_MKSTEMP) || defined(C_SOLARIS) || defined(C_CYGWIN)

-			fd = mkstemp(fullname);

-#else

-			(void)mktemp(fullname);

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

-#endif

-

-			if(fd < 0) {

+			if(fout < 0) {

 				cli_errmsg("Can't create temporary file %s: %s\n", fullname, strerror(errno));

-				cli_dbgmsg("%lu %lu %lu\n",

-					(unsigned long)suffixLen,

-					(unsigned long)sizeof(fullname),

-					(unsigned long)strlen(fullname));

 				return CL_ETMPFILE;

 			}

-

-			cli_dbgmsg("cli_untar: extracting %s\n", fullname);

+			

+			cli_dbgmsg("cli_untar: extracting to %s\n", fullname);

 			in_block = 1;

-			if((outfile = fdopen(fd, "wb")) == NULL) {

-				cli_errmsg("cli_untar: cannot create file %s\n",

-					fullname);

-				close(fd);

-				return CL_ETMPFILE;

-			}

 		} else { /* write or continue writing file contents */

 			const int nbytes = size>512? 512:size;

-			const int nwritten = (int)fwrite(block, 1, (size_t)nbytes, outfile);

+			const int nwritten = (int)write(fout, block, (size_t)nbytes);

 			if(nwritten != nbytes) {

 				cli_errmsg("cli_untar: only wrote %d bytes to file %s (out of disc space?)\n",

 					nwritten, fullname);

-				if(outfile)

-					fclose(outfile);

+				close(fout);

 				return CL_EIO;

 			}

 			size -= nbytes;

@@ -247,8 +214,15 @@ cli_untar(const char *dir, int desc, unsigned int posix, cli_ctx *ctx)

 		if (size == 0)

 			in_block = 0;

         }	

-	if(outfile)

-		return fclose(outfile);

-

-	return 0;

+	if(fout>=0) {

+		int ret;

+		lseek(fout, 0, SEEK_SET);

+		ret = cli_magic_scandesc(fout, ctx);

+		close(fout);

+		if (!cli_leavetemps_flag)

+			unlink(fullname);

+		if (ret==CL_VIRUS)

+			return CL_VIRUS;

+	}

+	return CL_CLEAN;

 }