pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-25 12:26:40 +02:00
Code Activity

irc: fix crash on command "/allchan /close"

Browse Source
This commit is contained in:
Sebastien Helleu
2013-04-10 23:09:00 +02:00
parent aa10e20295
commit 67f6668d1b
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2 -1
View File
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
v0.4.1-dev, 2013-03-25
v0.4.1-dev, 2013-04-10
This document lists all changes for each version.
@@ -45,6 +45,7 @@ Version 0.4.1 (under dev!)
list with arguments inside), guile >= 2.0 is now required (bug #38350)
* guile: fix crash on calls to callbacks during load of script (bug #38343)
* guile: fix compilation with guile 2.0
* irc: fix crash on command "/allchan /close"
* irc: add option irc.look.display_join_message (task #10895)
* irc: fix default completion (like nicks) in commands /msg, /notice, /query and
/topic
src/plugins/irc/irc-command.c
+21 -9
View File
@@ -121,8 +121,8 @@ irc_command_exec_all_channels (struct t_irc_server *server,
const char *exclude_channels,
const char *command)
{
struct t_irc_server *ptr_server;
struct t_irc_channel *ptr_channel;
struct t_irc_server *ptr_server, *next_server;
struct t_irc_channel *ptr_channel, *next_channel;
char **channels, *str_command;
int num_channels, length, excluded, i;
@@ -144,16 +144,20 @@ irc_command_exec_all_channels (struct t_irc_server *server,
channels = (exclude_channels && exclude_channels[0]) ?
weechat_string_split (exclude_channels, ",", 0, 0, &num_channels) : NULL;
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
ptr_server = irc_servers;
while (ptr_server)
{
next_server = ptr_server->next_server;
if (!server || (ptr_server == server))
{
if (ptr_server->is_connected)
{
for (ptr_channel = ptr_server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
ptr_channel = ptr_server->channels;
while (ptr_channel)
{
next_channel = ptr_channel->next_channel;
if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
{
excluded = 0;
@@ -174,9 +178,13 @@ irc_command_exec_all_channels (struct t_irc_server *server,
weechat_command (ptr_channel->buffer, str_command);
}
}
ptr_channel = next_channel;
}
}
}
ptr_server = next_server;
}
free (str_command);
@@ -241,7 +249,7 @@ irc_command_allchan (void *data, struct t_gui_buffer *buffer, int argc,
void
irc_command_exec_all_servers (const char *exclude_servers, const char *command)
{
struct t_irc_server *ptr_server;
struct t_irc_server *ptr_server, *next_server;
char **servers, *str_command;
int num_servers, length, excluded, i;
@@ -263,9 +271,11 @@ irc_command_exec_all_servers (const char *exclude_servers, const char *command)
servers = (exclude_servers && exclude_servers[0]) ?
weechat_string_split (exclude_servers, ",", 0, 0, &num_servers) : NULL;
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
ptr_server = irc_servers;
while (ptr_server)
{
next_server = ptr_server->next_server;
if (ptr_server->is_connected)
{
excluded = 0;
@@ -286,6 +296,8 @@ irc_command_exec_all_servers (const char *exclude_servers, const char *command)
weechat_command (ptr_server->buffer, str_command);
}
}
ptr_server = next_server;
}
free (str_command);