# HG changeset patch # User Richard Laager # Date 1177738676 0 # Node ID 99bf55ec6ca42870b1ab5ef4e626266653499628 # Parent db7e68346e44eaca58deb5bb246ab452787e6804 Fix an invalid read that occurs because we were accessing IM data when the conversation was a chat. Here's the relevant valgrind output. ==18344== Invalid read of size 4 ==18344== at 0x8089DA1: update_typing_icon (gtkconv.c:3138) ==18344== by 0x8090742: pidgin_conv_update_fields (gtkconv.c:6081) ... ==18344== Address 0x107EADD0 is 12 bytes after a block of size 12 alloc'd ==18344== at 0x40056D5: calloc (vg_replace_malloc.c:279) ==18344== by 0x4D48EC4D: g_malloc0 (in /usr/lib/libglib-2.0.so.0.1200.4) ==18344== by 0x809149B: private_gtkconv_new (gtkconv.c:4608) ==18344== by 0x4056637: purple_conversation_new (conversation.c:324) ==18344== by 0x40785EB: serv_got_joined_chat (server.c:699) ==18344== by 0x493C813: irc_msg_join (msgs.c:722) ... diff -r db7e68346e44 -r 99bf55ec6ca4 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Sat Apr 28 04:23:42 2007 +0000 +++ b/pidgin/gtkconv.c Sat Apr 28 05:37:56 2007 +0000 @@ -3134,7 +3134,10 @@ gtk_widget_hide(gtkwin->menu.typing_icon); } - if (!im || (purple_conv_im_get_typing_state(im) == PURPLE_NOT_TYPING)) { + if (im == NULL) + return; + + if (purple_conv_im_get_typing_state(im) == PURPLE_NOT_TYPING) { if (gtkconv->u.im->typing_timer != 0) g_source_remove(gtkconv->u.im->typing_timer); return;