aboutsummaryrefslogtreecommitdiff
path: root/cmd-new-session.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2021-07-06 10:01:22 +0100
committerThomas Adam <thomas@xteddy.org>2021-07-06 10:01:22 +0100
commited575182e3018d81a0b3b81bde4a64bad967c298 (patch)
tree833ec8dbcfbdf27ee247af05c3eae6887dc6ef56 /cmd-new-session.c
parentb1a8c0fe022e99cffb0fb4f321740464f35bc6b9 (diff)
parent32f2d9d089ced7d693aa412821f1d66134877cf0 (diff)
downloadrtmux-ed575182e3018d81a0b3b81bde4a64bad967c298.tar.gz
rtmux-ed575182e3018d81a0b3b81bde4a64bad967c298.tar.bz2
rtmux-ed575182e3018d81a0b3b81bde4a64bad967c298.zip
Merge branch 'obsd-master' into master
Diffstat (limited to 'cmd-new-session.c')
-rw-r--r--cmd-new-session.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c
index c47d66cd..666aeaac 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -102,6 +102,11 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
if (tmp != NULL) {
name = format_single(item, tmp, c, NULL, NULL, NULL);
newname = session_check_name(name);
+ if (newname == NULL) {
+ cmdq_error(item, "invalid session: %s", name);
+ free(name);
+ return (CMD_RETURN_ERROR);
+ }
free(name);
}
if (args_has(args, 'A')) {
@@ -134,8 +139,14 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
prefix = xstrdup(sg->name);
else if (groupwith != NULL)
prefix = xstrdup(groupwith->name);
- else
+ else {
prefix = session_check_name(group);
+ if (prefix == NULL) {
+ cmdq_error(item, "invalid session group: %s",
+ group);
+ goto fail;
+ }
+ }
}
/* Set -d if no client. */