From 219750c40a03a4256f5f72ea335f0500ff305006 Mon Sep 17 00:00:00 2001 From: Mark Doliner Date: Sat, 18 Feb 2012 23:00:10 +0000 Subject: [PATCH] *** Plucked rev d1d77da56217f3a083e1d459bef054db9f1d5699 (qulogic@pidgin.im): Rearrange code to prevent a NULL-deference. Thanks to clh for pointing out this issue. Closes #14392. --HG-- branch : release-2.x.y extra : convert_revision : e30e044988add329e86eaf06a2f6ab1b3c5c47bb --- pidgin/gtkconv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c index f76dcc4058..cd192b62fc 100644 --- a/pidgin/gtkconv.c +++ b/pidgin/gtkconv.c @@ -6216,7 +6216,15 @@ pidgin_conv_chat_rename_user(PurpleConversation *conv, const char *old_name, if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter)) return; + if ((tag = get_buddy_tag(conv, old_name, 0, FALSE))) + g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, NULL); + if ((tag = get_buddy_tag(conv, old_name, PURPLE_MESSAGE_NICK, FALSE))) + g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, NULL); + old_cbuddy = purple_conv_chat_cb_find(chat, old_name); + if (!old_cbuddy) + return; + if (get_iter_from_chatbuddy(old_cbuddy, &iter)) { GtkTreeRowReference *ref = old_cbuddy->ui_data; @@ -6225,14 +6233,6 @@ pidgin_conv_chat_rename_user(PurpleConversation *conv, const char *old_name, old_cbuddy->ui_data = NULL; } - if ((tag = get_buddy_tag(conv, old_name, 0, FALSE))) - g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, NULL); - if ((tag = get_buddy_tag(conv, old_name, PURPLE_MESSAGE_NICK, FALSE))) - g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, NULL); - - if (!old_cbuddy) - return; - g_return_if_fail(new_alias != NULL); new_cbuddy = purple_conv_chat_cb_find(chat, new_name); -- 2.11.4.GIT