Fix a leak of a few vdms_token and one JsonObject

2 files changed, 5 insertions, 1 deletions

diff --git a/skypeweb/libskypeweb.c b/skypeweb/libskypeweb.c
index 9cb8453..8392073 100644
--- a/skypeweb/libskypeweb.c
+++ b/skypeweb/libskypeweb.c
@@ -405,6 +405,7 @@ skypeweb_close(PurpleConnection *pc)
 	

 	g_hash_table_destroy(sa->sent_messages_hash);

 	

+	g_free(sa->vdms_token);

 	g_free(sa->messages_host);

 	g_free(sa->skype_token);

 	g_free(sa->registration_token);

diff --git a/skypeweb/skypeweb_messages.c b/skypeweb/skypeweb_messages.c
index da77420..d24e794 100644
--- a/skypeweb/skypeweb_messages.c
+++ b/skypeweb/skypeweb_messages.c
@@ -1043,13 +1043,15 @@ skypeweb_subscribe_to_contact_status(SkypeWebAccount *sa, GSList *contacts)
 	contacts_array = json_array_new();

 	

 	do {

-		JsonObject *contact = json_object_new();

+		JsonObject *contact;

 		gchar *id;

 		

 		if (SKYPEWEB_BUDDY_IS_BOT(cur->data)) {

 			purple_protocol_got_user_status(sa->account, cur->data, SKYPEWEB_STATUS_ONLINE, NULL);

 			continue;

 		}

+

+		contact = json_object_new();

 		

 		id = g_strconcat(skypeweb_user_url_prefix(cur->data), cur->data, NULL);

 		json_object_set_string_member(contact, "id", id);

@@ -1205,6 +1207,7 @@ skypeweb_got_vdms_token(PurpleHttpConnection *http_conn, PurpleHttpResponse *res
 		JsonObject *obj = json_node_get_object(root);

 

 		token = json_object_get_string_member(obj, "token");

+		g_free(sa->vdms_token);

 		sa->vdms_token = g_strdup(token); 

 		sa->vdms_expiry = (int)time(NULL) + SKYPEWEB_VDMS_TTL;

 	}