From 4c737ebd1a0224d325ee0ab6b3b374861c708452 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 2 Sep 2010 00:06:56 +0100 Subject: Fixed NULL ptr dereference when hilighting non-IM users in chatrooms. --- irc_im.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'irc_im.c') diff --git a/irc_im.c b/irc_im.c index 662a5bf2..f6229207 100644 --- a/irc_im.c +++ b/irc_im.c @@ -692,7 +692,7 @@ static gboolean bee_irc_channel_chat_privmsg( irc_channel_t *ic, const char *msg if( ( s = strchr( nick, ':' ) ) || ( s = strchr( nick, ',' ) ) ) { *s = '\0'; - if( ( iu = irc_user_by_name( ic->irc, nick ) ) && + if( ( iu = irc_user_by_name( ic->irc, nick ) ) && iu->bu && iu->bu->nick && irc_channel_has_user( ic, iu ) ) { trans = g_strconcat( iu->bu->nick, msg + ( s - nick ), NULL ); -- cgit v1.2.3 From 41e0c00fd22d1cdace2040be5912d64f51f12ab8 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 5 Sep 2010 11:27:12 +0100 Subject: Fixing handling of (Jabber) chatroom topic changes done by the user. --- irc_im.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'irc_im.c') diff --git a/irc_im.c b/irc_im.c index f6229207..7fa70350 100644 --- a/irc_im.c +++ b/irc_im.c @@ -797,9 +797,9 @@ static gboolean bee_irc_channel_chat_topic( irc_channel_t *ic, const char *new ) char *topic = g_strdup( new ); c->ic->acc->prpl->chat_topic( c, topic ); g_free( topic ); - return TRUE; } + /* Whatever happened, the IM module should ack the topic change. */ return FALSE; } -- cgit v1.2.3 From d6657ce1d4fa016bfa0e013f29351229e2cc23d1 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Mon, 6 Sep 2010 00:30:40 +0100 Subject: Fix NULL pointer dereference when removing nicks from groupchats. --- irc_im.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'irc_im.c') diff --git a/irc_im.c b/irc_im.c index 7fa70350..6c8b7f70 100644 --- a/irc_im.c +++ b/irc_im.c @@ -529,7 +529,7 @@ static gboolean bee_irc_chat_remove_user( bee_t *bee, struct groupchat *c, bee_u irc_t *irc = bee->ui_data; irc_channel_t *ic = c->ui_data; - if( ic == NULL ) + if( ic == NULL || bu == NULL ) return FALSE; /* TODO: Possible bug here: If a module removes $user here instead of just -- cgit v1.2.3