@@ -1,3 +1,20 @@

+Thu Sep  6 17:18:01 BST 2007 (njh)

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

+  * libclamav/pdf.c:	Ensure consistency with other archivers when attempted

+				DoS attacks are caught

+

+Thu Sep  6 12:30:10 BST 2007 (njh)

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

+  * libclamav, clamav-milter:	Various cleanups

+  * libclamav/blob.c:	Handle cli_readn() difficulties when called by

+				cli_check_mydoom_log()

+

+Tue Sep  4 16:38:18 BST 2007 (njh)

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

+  * libclamav/pdf.c:	Don't clear any stored virus name

+  * libclamav/[mbox|message.c]:	Code clean up

+  * clamav-milter/clamav-milter.c:	Blacklist crackers

+

 Tue Sep  4 11:48:08 BST 2007 (njh)

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

   * libclamav/mbox.c:	Catch phishes with NULL names

@@ -487,35 +487,16 @@ cli_pdf(const char *dir, int desc, const cli_ctx *ctx)

 				 * Note that it will probably be both

 				 * ascii85encoded and flateencoded

 				 */

-				if(is_flatedecode) {

-					const int zstat = try_flatedecode((unsigned char *)tmpbuf, real_streamlen, real_streamlen, fout, ctx);

-

-					switch(zstat) {

-						case Z_DATA_ERROR:

-							rc = *ctx->virname ? CL_VIRUS : CL_EZIP;

-							break;

-						case Z_OK:

-							break;

-						default:

-							rc = CL_EZIP;

-					}

-				} else

+				if(is_flatedecode)

+					rc = try_flatedecode((unsigned char *)tmpbuf, real_streamlen, real_streamlen, fout, ctx);

+				else

 					cli_writen(fout, (const char *)streamstart, real_streamlen);

 			}

 			free(tmpbuf);

-		} else if(is_flatedecode) {

-			const int zstat = try_flatedecode((unsigned char *)streamstart, real_streamlen, calculated_streamlen, fout, ctx);

-

-			switch(zstat) {

-				case Z_DATA_ERROR:

-					rc = *ctx->virname ? CL_VIRUS : CL_EZIP;

-					break;

-				case Z_OK:

-					break;

-				default:

-					rc = CL_EZIP;

-			}

-		} else {

+		} else if(is_flatedecode)

+			rc = try_flatedecode((unsigned char *)streamstart, real_streamlen, calculated_streamlen, fout, ctx);

+

+		else {

 			cli_dbgmsg("cli_pdf: writing %lu bytes from the stream\n",

 				(unsigned long)real_streamlen);

 			cli_writen(fout, (const char *)streamstart, real_streamlen);

@@ -543,26 +524,28 @@ cli_pdf(const char *dir, int desc, const cli_ctx *ctx)

 	return rc;

 }

-/* flate inflation - returns zlib status, e.g. Z_OK */

+/*

+ * flate inflation - returns clamAV status, e.g CL_SUCCESS, CL_EZIP

+ */

 static int

 try_flatedecode(unsigned char *buf, off_t real_len, off_t calculated_len, int fout, const cli_ctx *ctx)

 {

 	int ret = flatedecode(buf, real_len, fout, ctx);

-	if(ret == Z_OK)

-		return Z_OK;

+	if(ret == CL_SUCCESS)

+		return CL_SUCCESS;

 	if(real_len == calculated_len) {

 		/*

 		 * Nothing more we can do to inflate

 		 */

 		cli_warnmsg("Bad compression in flate stream\n");

-		return ret;

+		return (ret == CL_SUCCESS) ? CL_EFORMAT : ret;

 	}

 	ret = flatedecode(buf, calculated_len, fout, ctx);

-	if(ret == Z_OK)

-		return Z_OK;

+	if(ret == CL_SUCCESS)

+		return CL_SUCCESS;

 	/* i.e. the PDF file is broken :-( */

 	cli_warnmsg("cli_pdf: Bad compressed block length in flate stream\n");

@@ -586,7 +569,7 @@ flatedecode(unsigned char *buf, off_t len, int fout, const cli_ctx *ctx)

 	if(len == 0) {

 		cli_warnmsg("cli_pdf: flatedecode len == 0\n");

-		return Z_OK;

+		return CL_CLEAN;

 	}

 #ifdef	SAVE_TMP

@@ -625,7 +608,7 @@ flatedecode(unsigned char *buf, off_t len, int fout, const cli_ctx *ctx)

 	zstat = inflateInit(&stream);

 	if(zstat != Z_OK) {

 		cli_warnmsg("cli_pdf: inflateInit failed");

-		return zstat;

+		return CL_EZIP;

 	}

 	nbytes = 0;

@@ -644,9 +627,11 @@ flatedecode(unsigned char *buf, off_t len, int fout, const cli_ctx *ctx)

 						cli_dbgmsg("cli_pdf: flatedecode size exceeded (%lu)\n",

 							(unsigned long)nbytes);

 						inflateEnd(&stream);

-						if(BLOCKMAX)

+						if(BLOCKMAX) {

 							*ctx->virname = "PDF.ExceededFileSize";

-						return Z_DATA_ERROR;

+							return CL_VIRUS;

+						}

+						return CL_EZIP;

 					}

 					stream.next_out = output;

 					stream.avail_out = sizeof(output);

@@ -663,14 +648,14 @@ flatedecode(unsigned char *buf, off_t len, int fout, const cli_ctx *ctx)

 					cli_dbgmsg("pdf: after writing %lu bytes, got error %d inflating PDF attachment\n",

 						(unsigned long)nbytes, zstat);

 				inflateEnd(&stream);

-				return zstat;

+				return (zstat == Z_OK) ? CL_SUCCESS : CL_EZIP;

 		}

 		break;

 	}

 	if(stream.avail_out != sizeof(output))

 		if(cli_writen(fout, output, sizeof(output) - stream.avail_out) < 0)

-			return Z_STREAM_ERROR;

+			return CL_EIO;

 	/*

 	 * On BSD systems total_in and total_out are "long long", so these

@@ -686,15 +671,17 @@ flatedecode(unsigned char *buf, off_t len, int fout, const cli_ctx *ctx)

 	   ((stream.total_out / stream.total_in) > ctx->limits->maxratio)) {

 		cli_dbgmsg("cli_pdf: flatedecode Max ratio reached\n");

 		inflateEnd(&stream);

-		if(BLOCKMAX)

+		if(BLOCKMAX) {

 			*ctx->virname = "Oversized.PDF";

-		return Z_DATA_ERROR;

+			return CL_VIRUS;

+		}

+		return CL_EZIP;

 	}

 #ifdef	SAVE_TMP

 	unlink(tmpfilename);

 #endif

-	return inflateEnd(&stream);

+	return inflateEnd(&stream) == Z_OK ? CL_SUCCESS : CL_EZIP;

 }

 /*