major memory leak in ICQ cookie module

git-svn-id: http://svn.miranda-ng.org/main/trunk@16829 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 33 insertions, 40 deletions

diff --git a/protocols/IcqOscarJ/src/cookies.h b/protocols/IcqOscarJ/src/cookies.h
index 82178f9b01..843cc404ad 100644
--- a/protocols/IcqOscarJ/src/cookies.h
+++ b/protocols/IcqOscarJ/src/cookies.h
@@ -41,43 +41,41 @@
 struct CIcqProto;

 

 /* Basic structure used to hold operation cookies list */

-struct icq_cookie_info

+

+struct icq_cookie_info : public MZeroedObject

 {

-  DWORD dwCookie;

-  MCONTACT hContact;

-  void *pvExtra;

-  time_t dwTime;

-  BYTE bType;

+	DWORD dwCookie;

+	MCONTACT hContact;

+	void *pvExtra;

+	time_t dwTime;

+	BYTE bType;

 };

 

-

 /* Specific structures to hold request specific data - pvExtra */

 

 struct cookie_family_request

 {

-  WORD wFamily;

-  void (CIcqProto::*familyHandler)(HANDLE hConn, char* cookie, size_t cookieLen);

+	WORD wFamily;

+	void (CIcqProto::*familyHandler)(HANDLE hConn, char* cookie, size_t cookieLen);

 };

 

-

 struct cookie_offline_messages

 {

-  int nMessages;

-  int nMissed;

+	int nMessages;

+	int nMissed;

 };

 

-

 #define ACKTYPE_NONE   0

 #define ACKTYPE_SERVER 1

 #define ACKTYPE_CLIENT 2

 

 struct cookie_message_data

 {

-  DWORD dwMsgID1;

-  DWORD dwMsgID2;

-  WORD bMessageType;

-  BYTE nAckType;

-  BYTE isOffline;

+	DWORD dwMsgID1;

+	DWORD dwMsgID2;

+	WORD bMessageType;

+	BYTE nAckType;

+	BYTE isOffline;

 };

 

 #define REQUESTTYPE_OWNER        0

@@ -88,10 +86,9 @@ struct cookie_message_data
 

 struct cookie_fam15_data

 {

-  BYTE bRequestType;

+	BYTE bRequestType;

 };

 

-

 #define SEARCHTYPE_UID     0

 #define SEARCHTYPE_EMAIL   1

 #define SEARCHTYPE_NAMES   2

@@ -99,33 +96,30 @@ struct cookie_fam15_data
 

 struct cookie_search

 {

-  BYTE bSearchType;

-  char* szObject;

-  DWORD dwMainId;

-  DWORD dwStatus;

+	BYTE bSearchType;

+	char* szObject;

+	DWORD dwMainId;

+	DWORD dwStatus;

 };

 

-

 struct cookie_avatar

 {

-  DWORD dwUin;

-  MCONTACT hContact;

-  size_t hashlen;

-  BYTE *hash;

-  size_t cbData;

-  TCHAR *szFile;

+	DWORD dwUin;

+	MCONTACT hContact;

+	size_t hashlen;

+	BYTE *hash;

+	size_t cbData;

+	TCHAR *szFile;

 };

 

-

-struct cookie_reverse_connect: public cookie_message_data

+struct cookie_reverse_connect : public cookie_message_data

 {

-  MCONTACT hContact;

-  DWORD dwUin;

-  int type;

-  void *ft;

+	MCONTACT hContact;

+	DWORD dwUin;

+	int type;

+	void *ft;

 };

 

-

 #define DIRECTORYREQUEST_INFOUSER       0x01

 #define DIRECTORYREQUEST_INFOOWNER      0x02

 #define DIRECTORYREQUEST_INFOMULTI      0x03

@@ -136,8 +130,7 @@ struct cookie_reverse_connect: public cookie_message_data
 

 struct cookie_directory_data

 {

-  BYTE bRequestType;

+	BYTE bRequestType;

 };

 

-

 #endif /* __COOKIES_H */