1
0
mirror of https://github.com/irssi/irssi.git synced 2024-06-23 06:35:36 +00:00

Merge pull request #50 from dajohi/cmd_null_deref

Avoid potential null dereferences.
This commit is contained in:
Alexander Færøy 2014-06-21 10:53:00 +02:00
commit dcbcb5f04d

View File

@ -74,7 +74,7 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server,
return;
if (strcmp(target, "*") == 0)
target = item == NULL ? NULL : window_item_get_target(item);
if (*target == '\0' || *msg == '\0')
if (target == NULL || *target == '\0' || *msg == '\0')
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
recoded = recode_out(SERVER(server), msg, target);
@ -101,7 +101,7 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server,
return;
if (strcmp(target, "*") == 0)
target = item == NULL ? NULL : window_item_get_target(item);
if (*target == '\0' || *ctcpcmd == '\0')
if (target == NULL || *target == '\0' || *ctcpcmd == '\0')
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
ascii_strup(ctcpcmd);
@ -135,7 +135,7 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC *server,
return;
if (strcmp(target, "*") == 0)
target = item == NULL ? NULL : window_item_get_target(item);
if (*target == '\0' || *ctcpcmd == '\0')
if (target == NULL || *target == '\0' || *ctcpcmd == '\0')
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
ascii_strup(ctcpcmd);