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

+Fri Jul 22 23:15:20 BST 2005 (njh)

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

+  * libclamav/pdf.c:	Remove allocation of 0 bytes if ascii85decode decodes

+				to 0 bytes

+

 Thu Jul 21 03:47:03 CEST 2005 (tk)

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

   * libclamav/others.c: cli_rmdirs: fix possible infinite loop. Patch by Mark

@@ -15,7 +15,7 @@

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

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-static	char	const	rcsid[] = "$Id: pdf.c,v 1.27 2005/06/24 20:48:53 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: pdf.c,v 1.28 2005/07/22 22:15:08 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -227,6 +227,13 @@ cli_pdf(const char *dir, int desc)

 				break;

 			}

 		}

+		streamlen = (int)(streamend - streamstart) + 1;

+

+		if(streamlen == 0) {

+			cli_dbgmsg("Empty stream");

+			continue;

+		}

+

 		/*while(strchr("\r\n", *--streamend))

 			;*/

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

@@ -243,8 +250,6 @@ cli_pdf(const char *dir, int desc)

 			break;

 		}

-		streamlen = (int)(streamend - streamstart) + 1;

-

 		cli_dbgmsg("length %d, streamlen %d\n", length, streamlen);

 #if	0

@@ -274,18 +279,20 @@ cli_pdf(const char *dir, int desc)

 				rc = CL_EFORMAT;

 				continue;

 			}

-			streamlen = (size_t)ret;

-			/* free unused traling bytes */

-			tmpbuf = cli_realloc(tmpbuf, streamlen);

-			/*

-			 * Note that it will probably be both ascii85encoded

-			 * and flateencoded

-			 */

-			if(is_flatedecode) {

-				const int zstat = flatedecode((unsigned char *)tmpbuf, streamlen, fout);

-

-				if(zstat != Z_OK)

-					rc = CL_EZIP;

+			if(ret) {

+				streamlen = (size_t)ret;

+				/* free unused trailing bytes */

+				tmpbuf = cli_realloc(tmpbuf, streamlen);

+				/*

+				 * Note that it will probably be both

+				 * ascii85encoded and flateencoded

+				 */

+				if(is_flatedecode) {

+					const int zstat = flatedecode((unsigned char *)tmpbuf, streamlen, fout);

+

+					if(zstat != Z_OK)

+						rc = CL_EZIP;

+				}

 			}

 			free(tmpbuf);

 		} else if(is_flatedecode) {