@@ -1,3 +1,7 @@

+Wed Jan 14 10:09:30 GMT 2004 (njh)

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

+  * libclamav: blobGetData now allows contents to be changed - tuttut

+

 Wed Jan 14 04:44:03 CET 2004 (tk)

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

   * libclamav: reversed zziplib patch from 20031224 (due to a problem reported

@@ -14,7 +14,10 @@

  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.

+ *

+ * $LOG$

  */

+static	char	const	rcsid[] = "$Id: blob.c,v 1.3 2004/01/14 10:08:59 nigelhorne Exp $";

 #include <stdlib.h>

 #include <string.h>

@@ -146,7 +149,7 @@ blobAddData(blob *b, const unsigned char *data, size_t len)

 #else

 		b->size += 128 * 1024;

 #endif

-		b->data = realloc(b->data, b->size);

+		b->data = cli_realloc(b->data, b->size);

 	}

 	assert(b->data != NULL);

@@ -155,7 +158,7 @@ blobAddData(blob *b, const unsigned char *data, size_t len)

 	b->len += len;

 }

-const unsigned char *

+unsigned char *

 blobGetData(const blob *b)

 {

 	assert(b != NULL);

@@ -14,6 +14,8 @@

  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.

+ *

+ * $LOG$

  */

 typedef struct blob {

@@ -32,5 +34,5 @@ void	blobArrayDestroy(blob *b[], int n);

 void	blobSetFilename(blob *b, const char *filename);

 const	char	*blobGetFilename(const blob *b);

 void	blobAddData(blob *b, const unsigned char *data, size_t len);

-const	unsigned char *blobGetData(const blob *b);

+unsigned char *blobGetData(const blob *b);

 unsigned	long	blobGetDataSize(const blob *b);

@@ -17,6 +17,9 @@

  *

  * Change History:

  * $Log: message.c,v $

+ * Revision 1.15  2004/01/14 10:08:45  nigelhorne

+ * blobGetData now allows contents to be changed - tuttut

+ *

  * Revision 1.14  2004/01/10 13:01:19  nigelhorne

  * Added BinHex compression support

  *

@@ -39,7 +42,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.14 2004/01/10 13:01:19 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.15 2004/01/14 10:08:45 nigelhorne Exp $";

 #ifndef	CL_DEBUG

 /*#define	NDEBUG	/* map CLAMAV debug onto standard */

@@ -631,6 +634,10 @@ messageToBlob(const message *m)

 		data = blobGetData(tmp);

 		len = blobGetDataSize(tmp);

+		/*

+		 * FIXME: this is dirty code, modification of the contents

+		 * of a member of the blob object should be done through blob.c

+		 */

 		if(data[0] == ':') {

 			char *ptr;

 			unsigned long newlen = 0L;

@@ -646,10 +653,10 @@ messageToBlob(const message *m)

 			for(l = 1; l < len; l++) {

 				unsigned char c = ptr[l];

-				char *tptr;

+				const unsigned char *tptr;

 				/* TODO: table look up would be quicker */

-				const char table[] =

+				const unsigned char table[] =

 					"!\"#$%&'()*+,-012345689@ABCDEFGHIJKLMNPQRSTUVXYZ[`abcdefhijklmpqr";

 				if((c == '\n') || (c == '\r'))

@@ -757,9 +764,9 @@ messageToBlob(const message *m)

 		/*

 		 * Discard attachments with no filename

 		 */

-		filename = messageFindArgument(m, "filename");

+		filename = (char *)messageFindArgument(m, "filename");

 		if(filename == NULL) {

-			filename = messageFindArgument(m, "name");

+			filename = (char *)messageFindArgument(m, "name");

 			if(filename == NULL) {

 				cli_dbgmsg("Attachment sent with no filename\n");