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

+Fri Mar  5 22:01:20 CET 2010 (tk)

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

+ * libclamav: fix scanning of utf16 data (bb#1853)

+

 Fri Mar  5 21:14:12 CET 2010 (tk)

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

  * libclamav/matcher-bm.c: properly handle scan boundaries in

@@ -186,7 +186,7 @@ cli_file_t cli_filetype2(fmap_t *map, const struct cl_engine *engine)

 	    decoded = (unsigned char *) cli_utf16toascii((char *) buff, bread);

 	    if(decoded) {

-		sret = cli_ac_scanbuff(decoded, strlen((char *) decoded), NULL, NULL, NULL,  engine->root[0], &mdata, 0, CL_TYPE_TEXT_ASCII, NULL, AC_SCAN_FT, NULL);

+		sret = cli_ac_scanbuff(decoded, bread / 2, NULL, NULL, NULL,  engine->root[0], &mdata, 0, CL_TYPE_TEXT_ASCII, NULL, AC_SCAN_FT, NULL);

 		free(decoded);

 		if(sret == CL_TYPE_HTML)

 		    ret = CL_TYPE_HTML_UTF16;

@@ -1138,7 +1138,7 @@ static int cli_scanhtml_utf16(cli_ctx *ctx)

 	at += bytes;

 	decoded = cli_utf16toascii(buff, bytes);

 	if(decoded) {

-	    if(write(fd, decoded, strlen(decoded)) == -1) {

+	    if(write(fd, decoded, bytes / 2) == -1) {

 		cli_errmsg("cli_scanhtml_utf16: Can't write to file %s\n", tempname);

 		free(decoded);

 		close(fd);