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

+Thu Jan 24 15:01:03 CET 2008 (acab)

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

+ * libclamav: realign structs (related to bb#474)

+

 Wed Jan 23 21:52:06 EET 2008 (edwin)

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

  * libclamav/entconv.c: optimize u16_normalize, encode as hex entities

@@ -35,8 +35,6 @@ struct DICT_HELPER {

 struct ASPK {

   uint32_t bitpos;

   uint32_t hash;

-  uint8_t array1[19];

-  uint8_t array2[758];

   uint32_t init_array[58];

   struct DICT_HELPER dict_helper[4];

   uint8_t *input;

@@ -45,6 +43,8 @@ struct ASPK {

   uint32_t decarray3[4][24];

   uint32_t decarray4[4][24];

   int dict_ok;

+  uint8_t array2[758];

+  uint8_t array1[19];

 };

@@ -78,9 +78,9 @@ static unsigned int u2a(uint8_t *dest, unsigned int len) {

 *********************/

 struct MT {

-  uint32_t mt[624];

-  uint32_t items;

   uint32_t *next;

+  uint32_t items;

+  uint32_t mt[624];

 };

 static uint8_t MT_getnext(struct MT *MT) {

@@ -56,10 +56,10 @@ typedef	struct fileblob {

 			 * email, not the full path name of the temporary file

 			 */

 	char	*fullname;	/* full pathname of the file */

+	cli_ctx	*ctx;	/* When set we can scan the blob, otherwise NULL */

+	unsigned	long	bytes_scanned;

 	unsigned	int	isNotEmpty : 1;

 	unsigned	int	isInfected : 1;

-	unsigned	long	bytes_scanned;

-	cli_ctx	*ctx;	/* When set we can scan the blob, otherwise NULL */

 } fileblob;

 fileblob	*fileblobCreate(void);

@@ -26,30 +26,29 @@

 #define CAB_INPUTMAX (CAB_BLOCKMAX + 6144)

 struct cab_archive {

+    struct cab_folder *folders;

+    struct cab_file *files;

     uint32_t length;

     uint16_t nfolders;

     uint16_t nfiles;

     uint16_t flags;

     uint16_t reshdr;

     uint8_t resdata;

-    struct cab_folder *folders;

-    struct cab_file *files;

 };

 struct cab_state {

     unsigned char *pt, *end;

+    void *stream;

     unsigned char block[CAB_INPUTMAX];

     uint16_t blklen;

     uint16_t outlen;

-    void *stream;

     uint16_t blknum;

 };

 struct cab_file {

-    uint32_t length;

-    uint16_t attribs;

     off_t offset;

     char *name;

+    uint32_t length;

     int error;

     int fd;

     int ofd;

@@ -57,14 +56,15 @@ struct cab_file {

     struct cab_file *next;

     struct cab_archive *cab;

     struct cab_state *state;

+    uint16_t attribs;

 };

 struct cab_folder {

-    uint16_t cmethod;

-    uint16_t nblocks;

     struct cab_archive *cab;

     off_t offset;

     struct cab_folder *next;

+    uint16_t cmethod;

+    uint16_t nblocks;

 };

 int cab_open(int fd, off_t offset, struct cab_archive *cab);

@@ -93,6 +93,8 @@ typedef struct chm_sys_entry_tag

 } chm_sys_entry_t;

 typedef struct chm_metadata_tag {

+	uint64_t file_length;

+	uint64_t file_offset;

 	chm_sys_entry_t sys_control;

 	chm_sys_entry_t sys_content;

 	chm_sys_entry_t sys_reset;

@@ -108,8 +110,6 @@ typedef struct chm_metadata_tag {

 	char *chunk_current;

 	char *chunk_end;

 	uint16_t chunk_entries;

-	uint64_t file_length;

-	uint64_t file_offset;

 } chm_metadata_t;

 int chm_unpack(int fd, const char *dirname);

@@ -53,10 +53,6 @@ struct entity_conv {

 	char* encoding;

 	enum encoding_priority priority;

 	enum encodings encoding_symbolic;

-	uint8_t has_bom;

-	uint8_t enc_bytes;

-	uint8_t  bom_cnt;

-	unsigned char bom[4];

 	size_t buffer_size;

 	void* iconv_struct;

 	unsigned char entity_buff[MAX_ENTITY_SIZE+2];

@@ -65,6 +61,10 @@ struct entity_conv {

 	m_area_t norm_area;

 	int      linemode;/* TODO:set */

 	int      linemode_processed;

+	unsigned char bom[4];

+	uint8_t has_bom;

+	uint8_t enc_bytes;

+	uint8_t  bom_cnt;

 };

 int init_entity_converter(struct entity_conv* conv, size_t buffer_size);

@@ -36,10 +36,10 @@ struct cli_exe_section {

 };

 struct cli_exe_info {

+    struct cli_exe_section *section;

+    off_t offset;

     uint32_t ep;

     uint16_t nsections;

-    off_t offset;

-    struct cli_exe_section *section;

 };

 #endif

@@ -60,10 +60,10 @@ struct xplstate {

   uint16_t backbytes;

   uint16_t backsize;

   uint8_t window[8192];

+  enum XPL_STATE state;

   uint8_t bits;

   uint8_t largewin;

   uint8_t litcodes;

-  enum XPL_STATE state;

 };

 int explode_init(struct xplstate *, uint16_t);

@@ -76,17 +76,17 @@ struct internal_state;

 typedef struct z_stream64_s {

     uint8_t		*next_in;  /* next input byte */

-    unsigned int	avail_in;  /* number of bytes available at next_in */

     unsigned long	total_in;  /* total nb of input bytes read so far */

+    unsigned int	avail_in;  /* number of bytes available at next_in */

-    uint8_t		*next_out; /* next output byte should be put there */

     unsigned int	avail_out; /* remaining free space at next_out */

+    uint8_t		*next_out; /* next output byte should be put there */

     unsigned long	total_out; /* total nb of bytes output so far */

     struct internal_state FAR *state; /* not visible by applications */

-    int     data_type;  /* best guess about the data type: binary or text */

     unsigned long   adler;      /* adler32 value of the uncompressed data */

+    int     data_type;  /* best guess about the data type: binary or text */

 } z_stream64;

 typedef z_stream64 FAR *z_stream64p;

@@ -39,19 +39,19 @@

 #define CLI_MATCH_NIBBLE_LOW	0x0400

 struct cli_matcher {

-    uint16_t maxpatlen;

-    uint8_t ac_only;

-

     /* Extended Boyer-Moore */

     uint8_t *bm_shift;

     struct cli_bm_patt **bm_suffix;

     uint32_t *soff, soff_len; /* for PE section sigs */

     /* Extended Aho-Corasick */

-    uint8_t ac_mindepth, ac_maxdepth;

+    uint32_t ac_partsigs, ac_nodes, ac_patterns;

     struct cli_ac_node *ac_root, **ac_nodetable;

     struct cli_ac_patt **ac_pattable;

-    uint32_t ac_partsigs, ac_nodes, ac_patterns;

+    uint8_t ac_mindepth, ac_maxdepth;

+

+    uint16_t maxpatlen;

+    uint8_t ac_only;

 };

 struct cli_meta_node {

@@ -213,10 +213,10 @@ typedef	unsigned	int	in_addr_t;

 typedef	struct	mbox_ctx {

 	const	char	*dir;

-	unsigned	int	files;	/* number of files extracted */

 	const	table_t	*rfc821Table;

 	const	table_t	*subtypeTable;

 	cli_ctx	*ctx;

+	unsigned	int	files;	/* number of files extracted */

 } mbox_ctx;

 static	int	cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx);

@@ -22,19 +22,16 @@

 /* The contents could change, ONLY access in message.c */

 typedef struct message {

-	mime_type	mimeType;

 	encoding_type	*encodingTypes;

+	mime_type	mimeType;

 	int	numberOfEncTypes;	/* size of encodingTypes */

 	char	*mimeSubtype;

-	int	numberOfArguments;	/* count of mimeArguments */

 	char	**mimeArguments;

 	char	*mimeDispositionType;	/* probably attachment */

 	text	*body_first, *body_last;

 	cli_ctx	*ctx;	/* When set we can scan the message, otherwise NULL */

-

-	char	base64_1, base64_2, base64_3;

+	int	numberOfArguments;	/* count of mimeArguments */

 	int	base64chars;

-	unsigned	int	isInfected : 1;

 	/*

 	 * Markers for the start of various non MIME messages that could

@@ -45,6 +42,10 @@ typedef struct message {

 	text	*yenc;		/* start of a yEnc message */

 	text	*encoding;	/* is the non MIME message encoded? */

 	const text	*dedupedThisFar;

+

+	char	base64_1, base64_2, base64_3;

+	unsigned	int	isInfected : 1;

+

 } message;

 message	*messageCreate(void);

@@ -57,9 +57,6 @@

 struct mszip_stream {

   int fd;		    /* input file descriptor */

   int ofd;                  /* output file descriptor */

-  unsigned char wflag;	    /* write flag */

-

-  unsigned int window_posn;             /* offset within window  */

   /* inflate() will call this whenever the window should be emptied. */

   int (*flush_window)(struct mszip_stream *, unsigned int);

@@ -70,6 +67,8 @@ struct mszip_stream {

   unsigned char *inbuf, *i_ptr, *i_end, *o_ptr, *o_end;

   unsigned int bit_buffer, bits_left, inbuf_size;

+  unsigned int window_posn;             /* offset within window  */

+

   /* huffman code lengths */

   unsigned char  LITERAL_len[MSZIP_LITERAL_MAXSYMBOLS];

   unsigned char  DISTANCE_len[MSZIP_DISTANCE_MAXSYMBOLS];

@@ -84,6 +83,9 @@ struct mszip_stream {

   /* cabinet related stuff */

   struct cab_file *file;

   int (*read)(struct cab_file *, unsigned char *, int);

+

+  unsigned char wflag;	    /* write flag */

+

 };

 struct mszip_stream *mszip_init(int fd,

@@ -118,7 +120,6 @@ struct qtm_model {

 struct qtm_stream {

   int fd;                   /* input file descriptor */

   int ofd;                  /* output file descriptor */

-  unsigned char wflag;	    /* write flag */

   unsigned char *window;          /* decoding window                         */

   unsigned int window_size;       /* window size                             */

@@ -127,14 +128,10 @@ struct qtm_stream {

   unsigned short H, L, C;         /* high/low/current: arith coding state    */

   unsigned char header_read;      /* have we started decoding a new frame?   */

+  unsigned char wflag;	    /* write flag */

   int error;

-  /* I/O buffers */

-  unsigned char *inbuf, *i_ptr, *i_end, *o_ptr, *o_end;

-  unsigned int  bit_buffer, inbuf_size;

-  unsigned char bits_left;

-

   /* data tables */

   unsigned int  position_base[42];

   unsigned char extra_bits[42], length_base[27], length_extra[27];

@@ -165,10 +162,18 @@ struct qtm_stream {

   struct qtm_modelsym m6sym[42 + 1], m6lsym[27 + 1];

   struct qtm_modelsym m7sym[7 + 1];

+  /* I/O buffers - 1*/

+  unsigned int  bit_buffer;

+

   /* cabinet related stuff */

   struct cab_file *file;

   int (*read)(struct cab_file *, unsigned char *, int);

+  /* I/O buffers - 2*/

+  unsigned char *inbuf, *i_ptr, *i_end, *o_ptr, *o_end;

+  unsigned int  inbuf_size;

+  unsigned char bits_left;

+

 };

 extern struct qtm_stream *qtm_init(int fd,

@@ -215,7 +220,6 @@ void qtm_free(struct qtm_stream *qtm);

 struct lzx_stream {

   int fd;			  /* input file descriptor                   */

   int ofd;			  /* output file descriptor                  */

-  unsigned char wflag;		  /* write flag */

   off_t   offset;                 /* number of bytes actually output         */

   off_t   length;                 /* overall decompressed length of stream   */

@@ -238,7 +242,6 @@ struct lzx_stream {

   unsigned char  block_type;      /* type of the current block               */

   unsigned char  header_read;     /* have we started decoding at all yet?    */

   unsigned char  posn_slots;      /* how many posn slots in stream?          */

-  unsigned char  input_end;       /* have we reached the end of input?       */

   int error;

@@ -261,16 +264,20 @@ struct lzx_stream {

 				(LZX_LENGTH_MAXSYMBOLS * 2)];

   unsigned short ALIGNED_table [(1 << LZX_ALIGNED_TABLEBITS) +

 				(LZX_ALIGNED_MAXSYMBOLS * 2)];

-

-  unsigned int  position_base[51];

-  unsigned char extra_bits[51];

+  unsigned char  input_end;       /* have we reached the end of input?       */

+  unsigned char wflag;		  /* write flag */

   /* this is used purely for doing the intel E8 transform */

   unsigned char  e8_buf[LZX_FRAME_SIZE];

+  unsigned int  position_base[51];

+

   /* cabinet related stuff */

   struct cab_file *file;

   int (*read)(struct cab_file *, unsigned char *, int);

+

+  unsigned char extra_bits[51];

+

 };

 struct lzx_stream *lzx_init(int fd,

@@ -99,10 +99,10 @@ typedef struct ole2_header_tag

 	/* must take account of the size of variables below here when

 	   reading the header */

 	int32_t sbat_root_start __attribute__ ((packed));

+	uint32_t max_block_no;

 	unsigned char *m_area;

 	off_t m_length;

 	bitset_t *bitset;

-	uint32_t max_block_no;

 } ole2_header_t;

 typedef struct property_tag

@@ -124,13 +124,13 @@ typedef unsigned char cat_t;

  * main compiled-expression structure

  */

 struct re_guts {

-	int magic;

 #		define	MAGIC2	((('R'^0200)<<8)|'E')

 	sop *strip;		/* malloced area for strip */

-	int csetsize;		/* number of bits in a cset vector */

-	int ncsets;		/* number of csets in use */

 	cset *sets;		/* -> cset [ncsets] */

 	uch *setbits;		/* -> uch[csetsize][ncsets/CHAR_BIT] */

+	int magic;

+	int csetsize;		/* number of bits in a cset vector */

+	int ncsets;		/* number of csets in use */

 	int cflags;		/* copy of cli_regcomp() cflags argument */

 	sopno nstates;		/* = number of sops */

 	sopno firststate;	/* the initial OEND (normally 0) */

@@ -145,8 +145,8 @@ struct re_guts {

 	cat_t *categories;	/* ->catspace[-CHAR_MIN] */

 	char *must;		/* match must contain this string */

 	int mlen;		/* length of must */

-	size_t nsub;		/* copy of re_nsub */

 	int backrefs;		/* does it use back references? */

+	size_t nsub;		/* copy of re_nsub */

 	sopno nplus;		/* how deep does it nest +s? */

 	/* catspace must be last */

 	cat_t catspace[1];	/* actually [NC] */

@@ -22,8 +22,8 @@

  */

 typedef	struct	tableEntry {

 	char	*key;

-	int	value;

 	struct	tableEntry	*next;

+	int	value;

 } tableEntry;

 typedef struct table {

@@ -146,11 +146,10 @@ typedef struct arj_file_hdr_tag {

 #endif

 typedef struct arj_decode_tag {

-	int fd;

 	unsigned char *text;

+	int fd;

 	uint16_t blocksize;

 	uint16_t bit_buf;

-	unsigned char sub_bit_buf;

 	int bit_count;

 	uint32_t comp_size;

 	int16_t getlen, getbuf;

@@ -159,6 +158,7 @@ typedef struct arj_decode_tag {

 	unsigned char c_len[NC];

 	uint16_t c_table[CTABLESIZE];

 	unsigned char pt_len[NPT];

+	unsigned char sub_bit_buf;

 	uint16_t pt_table[PTABLESIZE];

 } arj_decode_t;

@@ -22,12 +22,12 @@

 #define __UNARJ_H

 typedef struct arj_metadata_tag {

+	char *filename;

 	uint32_t comp_size;

 	uint32_t orig_size;

-	uint8_t method;

-	char *filename;

 	int encrypted;

 	int ofd;

+	uint8_t method;

 } arj_metadata_t;

 int cli_unarj_open(int fd, const char *dirname);

@@ -29,8 +29,8 @@ struct UNSP {

   uint32_t oldval;

   int error;

   /* the following are not in the original structure */

-  char *table;

   uint32_t tablesz;

+  char *table;

 };

 uint32_t unspack(char *, char *, cli_ctx *, uint32_t, uint32_t, uint32_t, int);

@@ -851,14 +851,14 @@ typedef struct {

 } mso_fib_t;

 typedef struct macro_entry_tag {

-	unsigned char key;

 	uint32_t len;

 	uint32_t offset;

+	unsigned char key;

 } macro_entry_t;

 typedef struct macro_info_tag {

-	uint16_t count;

 	struct macro_entry_tag *entries;

+	uint16_t count;

 } macro_info_t;

 static int

@@ -25,12 +25,12 @@

 #include "cltypes.h"

 typedef struct vba_project_tag {

-	int count;

 	char **name;

 	uint32_t *offset;

 	uint32_t *length;	/* for Word 6 macros */

 	unsigned char *key;	/* for Word 6 macros */

 	char *dir;

+	int count;

 } vba_project_t;

 vba_project_t	*cli_vba_readdir(const char *dir);