@@ -492,6 +492,7 @@ int cli_scanmacho(int fd, cli_ctx *ctx, struct cli_exe_info *fileinfo)

 int cli_machoheader(int fd, struct cli_exe_info *fileinfo)

 {

+return CL_EFORMAT; /* FIXMEFMAP: avoids crashing on machoes for now */

     return cli_scanmacho(fd, NULL, fileinfo);

 }

@@ -1089,13 +1089,14 @@ static int cli_scanhtml_utf16(cli_ctx *ctx)

     cli_dbgmsg("cli_scanhtml_utf16: using tempfile %s\n", tempname);

     while(at < map->len) {

-	bytes = map->len - at > map->pgsz * 16 ? map->pgsz * 16 : map->len - at;

+	bytes = MIN(map->len - at, map->pgsz * 16);

 	if(!(buff = fmap_need_off_once(map, at, bytes))) {

 	    close(fd);

 	    cli_unlink(tempname);

 	    free(tempname);

 	    return CL_EREAD;

 	}

+	at += bytes;

 	decoded = cli_utf16toascii(buff, bytes);

 	if(decoded) {

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