aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-15 04:28:09 -04:00
Code

Merge pull request #485 from ailin-nemui/bdo826525

Browse Source 
Do not crash on OPTCHAN when item has no server
This commit is contained in:
ailin-nemui 2016-06-07 02:47:57 +02:00
parent c438315741
commit 97e9347ee7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/commands.c
View File

@ -666,7 +666,7 @@ get_optional_channel(WI_ITEM_REC *active_item, char **data, int require_name)
const char *ret; const char *ret;
char *tmp, *origtmp, *channel; char *tmp, *origtmp, *channel;
if (active_item == NULL) { if (active_item == NULL || active_item->server == NULL) {
/* no active channel in window, channel required */ /* no active channel in window, channel required */
return cmd_get_param(data); return cmd_get_param(data);
} }
@ -674,11 +674,13 @@ get_optional_channel(WI_ITEM_REC *active_item, char **data, int require_name)
origtmp = tmp = g_strdup(*data); origtmp = tmp = g_strdup(*data);
channel = cmd_get_param(&tmp); channel = cmd_get_param(&tmp);
if (g_strcmp0(channel, "*") == 0 && !require_name) { if (g_strcmp0(channel, "*") == 0 && IS_CHANNEL(active_item) &&
!require_name) {
/* "*" means active channel */ /* "*" means active channel */
cmd_get_param(data); cmd_get_param(data);
ret = window_item_get_target(active_item); ret = window_item_get_target(active_item);
} else if (!server_ischannel(active_item->server, channel)) { } else if (IS_CHANNEL(active_item) &&
!server_ischannel(active_item->server, channel)) {
/* we don't have channel parameter - use active channel */ /* we don't have channel parameter - use active channel */
ret = window_item_get_target(active_item); ret = window_item_get_target(active_item);
} else { } else {