philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when passing $mychannels() a non-existent window refnum

Browse Source
This commit is contained in:
Kevin Easton
2017-11-10 16:53:32 +11:00
parent 8a176c6950
commit a028aebdb9
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,5 +1,7 @@
[Changes 1.2.2] [Changes 1.2.2]
* Fix crash when passing $mychannels() a non-existent window refnum. (caf)
* Remove dll_functions, dll_numeric, dll_commands, dll_variable, dll_ctcp, * Remove dll_functions, dll_numeric, dll_commands, dll_variable, dll_ctcp,
and dll_window variables from the module exports table. (caf) and dll_window variables from the module exports table. (caf)

16
source/functions.c
View File

@@ -1886,18 +1886,28 @@ BUILT_IN_FUNCTION(function_curpos, input)
RETURN_INT(current_window->screen->buffer_pos); RETURN_INT(current_window->screen->buffer_pos);
} }
/* $mychannels([window refnum])
*
* Returns the list of channels associated with the server for the given window.
*
* Note that this differs from the EPIC4/EPIC5 function of the same name, which
* takes a server refnum instead.
*/
BUILT_IN_FUNCTION(function_channels, input) BUILT_IN_FUNCTION(function_channels, input)
{ {
long winnum; Window *window = current_window;
Window *window = current_window;
if (isdigit((unsigned char)*input)) if (isdigit((unsigned char)*input))
{ {
long winnum;
GET_INT_ARG(winnum, input); GET_INT_ARG(winnum, input);
window = get_window_by_refnum(winnum); window = get_window_by_refnum(winnum);
} }
if (window->server <= -1)
if (!window)
RETURN_EMPTY; RETURN_EMPTY;
return create_channel_list(window); /* DON'T USE RETURN_STR HERE! */ return create_channel_list(window); /* DON'T USE RETURN_STR HERE! */
} }