Sametime protocol:

- patch fixes some memory leaks reported by Coverity and some other fixes and cleanup (by Wishmaster)
- some fixes by me

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

1 files changed, 3 insertions, 6 deletions

diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp
index aa7bafdf7b..d4aee066df 100644
--- a/protocols/Sametime/src/conference.cpp
+++ b/protocols/Sametime/src/conference.cpp
@@ -23,7 +23,6 @@ CSametimeProto* getProtoFromMwConference(mwConference* conf)
   @param inviter  the indentity of the user who sent the invitation

   @param invite   the invitation text

 */

-

 void mwServiceConf_on_invited(mwConference* conf, mwLoginInfo* inviter, const char* invite)

 {

 	GList *members, *mem;

@@ -340,12 +339,10 @@ int CSametimeProto::GcEventHook(WPARAM wParam, LPARAM lParam) {
 

 	if (strcmp(gch->pDest->pszModule, m_szModuleName) != 0) return 0;

 

-	GList *conferences, *conf;

-	conferences = conf = mwServiceConference_getConferences(service_conference);

-	for (;conf;conf = conf->next) {

+	GList *conferences = mwServiceConference_getConferences(service_conference);

+	for (GList *conf = conferences;conf;conf = conf->next) {

 		TCHAR* tszConfId = mir_utf8decodeT(mwConference_getName((mwConference*)conf->data));

 		if (mir_tstrcmp(gch->pDest->ptszID, tszConfId) == 0) {

-			

 			switch(gch->pDest->iType) {

 			case GC_USER_MESSAGE:

 				{

@@ -365,7 +362,7 @@ int CSametimeProto::GcEventHook(WPARAM wParam, LPARAM lParam) {
 				}

 				break;

 			}

-

+			mir_free(tszConfId);

 			break;

 		}

 		mir_free(tszConfId);