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

  *

  * Change History:

  * $Log: message.c,v $

+ * Revision 1.90  2004/09/22 16:24:22  nigelhorne

+ * Fix error return

+ *

  * Revision 1.89  2004/09/22 16:19:13  nigelhorne

  * Fix error return

  *

@@ -264,7 +267,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.89 2004/09/22 16:19:13 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.90 2004/09/22 16:24:22 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -896,19 +899,18 @@ messageSetEncoding(message *m, const char *enctype)

 				m->encodingTypes[m->numberOfEncTypes++] = e->type;

 				cli_dbgmsg("Encoding type %d is \"%s\"\n", m->numberOfEncTypes, type);

-				free(type);

 				break;

 			}

 		if(e->string == NULL) {

 			cli_warnmsg("Unknown encoding type \"%s\"\n", type);

+			free(type);

 			/*

 			 * Err on the side of safety, enable all decoding

 			 * modules

 			 */

 			messageSetEncoding(m, "base64");

 			messageSetEncoding(m, "quoted-printable");

-			free(type);

 			break;

 		}