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

+Fri Jan 25 10:14:23 EET 2008 (edwin)

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

+  * libclamav/entconv.[ch]: make iconv replacement function handle NULL args

+  (bb #792)

+

 Thu Jan 24 13:35:51 GMT 2008 (njh)

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

   * libclamav/mbox.c:	Use cli_strcasestr

@@ -24,4 +24,4 @@ encname_chars.h: gentbl

 	./gentbl encname_chars 0-9 a-z A-Z _ . / \( \) - : >$@

 clean: 

-	rm -f entitylist.h encoding_aliases.h entities_parsed generate_entitylist generate_encoding_aliases gentbl

+	rm -f entitylist.h encoding_aliases.h entities_parsed generate_entitylist generate_encoding_aliases gentbl encname_chars.h

@@ -240,10 +240,15 @@ static int iconv_close(iconv_t cd)

 static int iconv(iconv_t iconv_struct,char **inbuf, size_t *inbytesleft,

 		char** outbuf, size_t *outbytesleft)

 {

-	const size_t maxcopy = (*inbytesleft > *outbytesleft ? *outbytesleft  : *inbytesleft) & ~(iconv_struct->size - 1);

-	const uint8_t* input = (const uint8_t*)*inbuf;

-	uint8_t* output = (uint8_t*)*outbuf;

-	size_t i;

+	const uint8_t* input;

+	uint8_t* output;

+	size_t maxcopy, i;

+	if(!inbuf || !outbuf) {

+		return 0;

+	}

+	maxcopy = (*inbytesleft > *outbytesleft ? *outbytesleft  : *inbytesleft) & ~(iconv_struct->size - 1);

+	input = (const uint8_t*)*inbuf;

+	output = (uint8_t*)*outbuf;

 	/*,maxcopy is aligned to data size */

 	/* output is always utf16be !*/

@@ -1066,6 +1071,7 @@ unsigned char* encoding_norm_readline(struct entity_conv* conv, FILE* stream_in,

 		if(limit < 0) limit = 0;

 		conv->out_area.buffer[conv->out_area.length - limit - 1] = '\0';

+		puts(conv->out_area.buffer);

 		return conv->out_area.buffer;

 	}

 }

@@ -26,8 +26,8 @@

 #include "hashtab.h"

-#define UCS4_1234 "UCS-4LE"

-#define UCS4_4321 "UCS-4BE"

+#define UCS4_1234 "UCS-4BE"

+#define UCS4_4321 "UCS-4LE"

 #define UCS4_2143 "UCS4"

 #define UCS4_3412 "UCS-4"

 #define UTF16_BE "UTF-16BE"