From f990671c7cf7de24c19a0b3a4f7988a28f7eca29 Mon Sep 17 00:00:00 2001 From: Eion Robb Date: Mon, 10 Aug 2015 10:35:39 +1200 Subject: SkypeWeb : Fix another memory corruption since the MSN change thing --- skypeweb/skypeweb_messages.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/skypeweb/skypeweb_messages.c b/skypeweb/skypeweb_messages.c index efeded0..46de937 100644 --- a/skypeweb/skypeweb_messages.c +++ b/skypeweb/skypeweb_messages.c @@ -216,8 +216,6 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource) } else { const gchar *convbuddyname; // This is a One-to-one/IM message - from = skypeweb_contact_url_to_name(from); - g_return_if_fail(from); convbuddyname = skypeweb_contact_url_to_name(conversationLink); if (SKYPEWEB_BUDDY_IS_MSN(convbuddyname)) { @@ -226,6 +224,9 @@ process_message_resource(SkypeWebAccount *sa, JsonObject *resource) convname = g_strconcat("8:", convbuddyname, NULL); } + from = skypeweb_contact_url_to_name(from); + g_return_if_fail(from); + if (g_str_equal(messagetype_parts[0], "Control")) { if (g_str_equal(messagetype_parts[1], "ClearTyping")) { purple_serv_got_typing(sa->pc, from, 7, PURPLE_IM_NOT_TYPING); -- cgit v1.2.3