diff src/libpst.h @ 41:183ae993b9ad

security fix for potential buffer overrun in lz decompress
author carl
date Tue, 02 Oct 2007 15:49:44 -0700
parents 2ad7ef0a3c4f
children f6db1f060a95
line wrap: on
line diff
--- a/src/libpst.h	Fri Aug 24 18:57:59 2007 -0700
+++ b/src/libpst.h	Tue Oct 02 15:49:44 2007 -0700
@@ -177,58 +177,59 @@
 
 typedef struct _pst_item_email {
   FILETIME *arrival_date;
-  int32_t autoforward; // 1 = true, 0 = not set, -1 = false
-  char *body;
-  char *cc_address;
-  char *common_name;
-  int32_t  conv_index;
-  int32_t  conversion_prohib;
-  int32_t  delete_after_submit; // 1 = true, 0 = false
-  int32_t  delivery_report; // 1 = true, 0 = false
-  char *encrypted_body;
-  int32_t  encrypted_body_size;
-  char *encrypted_htmlbody;
-  int32_t encrypted_htmlbody_size;
-  int32_t  flag;
-  char *header;
-  char *htmlbody;
-  int32_t  importance;
-  char *in_reply_to;
-  int32_t  message_cc_me; // 1 = true, 0 = false
-  int32_t  message_recip_me; // 1 = true, 0 = false
-  int32_t  message_to_me; // 1 = true, 0 = false
-  char *messageid;
-  int32_t  orig_sensitivity;
-  char *outlook_recipient;
-  char *outlook_recipient2;
-  char *outlook_sender;
-  char *outlook_sender_name;
-  char *outlook_sender2;
-  int32_t  priority;
-  char *proc_subject;
-  int32_t  read_receipt;
-  char *recip_access;
-  char *recip_address;
-  char *recip2_access;
-  char *recip2_address;
-  int32_t  reply_requested;
-  char *reply_to;
-  char *return_path_address;
-  int32_t  rtf_body_char_count;
-  int32_t  rtf_body_crc;
-  char *rtf_body_tag;
-  char *rtf_compressed;
-  int32_t  rtf_in_sync; // 1 = true, 0 = doesn't exist, -1 = false
-  int32_t  rtf_ws_prefix_count;
-  int32_t  rtf_ws_trailing_count;
-  char *sender_access;
-  char *sender_address;
-  char *sender2_access;
-  char *sender2_address;
-  int32_t  sensitivity;
+  int32_t	autoforward; // 1 = true, 0 = not set, -1 = false
+  char	   *body;
+  char	   *cc_address;
+  char	   *common_name;
+  int32_t	conv_index;
+  int32_t	conversion_prohib;
+  int32_t	delete_after_submit; // 1 = true, 0 = false
+  int32_t	delivery_report; // 1 = true, 0 = false
+  char	   *encrypted_body;
+  int32_t	encrypted_body_size;
+  char	   *encrypted_htmlbody;
+  int32_t	encrypted_htmlbody_size;
+  int32_t	flag;
+  char	   *header;
+  char	   *htmlbody;
+  int32_t	importance;
+  char	   *in_reply_to;
+  int32_t	message_cc_me; // 1 = true, 0 = false
+  int32_t	message_recip_me; // 1 = true, 0 = false
+  int32_t	message_to_me; // 1 = true, 0 = false
+  char	   *messageid;
+  int32_t	orig_sensitivity;
+  char	   *outlook_recipient;
+  char	   *outlook_recipient2;
+  char	   *outlook_sender;
+  char	   *outlook_sender_name;
+  char	   *outlook_sender2;
+  int32_t	priority;
+  char	   *proc_subject;
+  int32_t	read_receipt;
+  char	   *recip_access;
+  char	   *recip_address;
+  char	   *recip2_access;
+  char	   *recip2_address;
+  int32_t	reply_requested;
+  char	   *reply_to;
+  char	   *return_path_address;
+  int32_t	rtf_body_char_count;
+  int32_t	rtf_body_crc;
+  char	   *rtf_body_tag;
+  char	   *rtf_compressed;
+  u_int32_t rtf_compressed_size;
+  int32_t	rtf_in_sync; // 1 = true, 0 = doesn't exist, -1 = false
+  int32_t	rtf_ws_prefix_count;
+  int32_t	rtf_ws_trailing_count;
+  char	   *sender_access;
+  char	   *sender_address;
+  char	   *sender2_access;
+  char	   *sender2_address;
+  int32_t	sensitivity;
   FILETIME *sent_date;
   pst_entryid *sentmail_folder;
-  char *sentto_address;
+  char		  *sentto_address;
   pst_item_email_subject *subject;
 } pst_item_email;