summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2000-08-15 21:54:33 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2000-08-15 21:54:33 +0000
commita02b9032528622b3815a1bceffdb6de91c885f1f (patch)
tree80dbe375f6de75072120d4703d9cd68e95ae5a43
parent3baf7fbd4c5724b50830271bd06e139a6f2ab712 (diff)
downloadirssi-a02b9032528622b3815a1bceffdb6de91c885f1f.zip
/MSG -servertag crashed irssi.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@609 dbcabf3a-b0e7-0310-adc4-f8d773084564
-rw-r--r--src/core/commands.c3
-rw-r--r--src/irc/core/irc-commands.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/core/commands.c b/src/core/commands.c
index 6802713f..b4362d59 100644
--- a/src/core/commands.c
+++ b/src/core/commands.c
@@ -244,6 +244,9 @@ int command_have_option(const char *cmd, const char *option)
rec = command_find(cmd);
g_return_val_if_fail(rec != NULL, FALSE);
+ if (rec->options == NULL)
+ return FALSE;
+
for (tmp = rec->options; *tmp != NULL; tmp++) {
char *name = iscmdtype(**tmp) ? (*tmp)+1 : *tmp;
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index b7c93ed4..bc1c96af 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -74,6 +74,7 @@ IRC_SERVER_REC *irccmd_options_get_server(const char *cmd,
signal_emit("error command", 2,
GINT_TO_POINTER(CMDERR_OPTION_UNKNOWN),
server == NULL ? list->data : list->next->data);
+ signal_stop();
server = NULL;
}