From 9b571daceec3ba038c669e90e20c3c0c2c755c57 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Fri, 24 Apr 2020 16:40:10 +0100 Subject: Instead of forbidding invalid session names, sanitize them. --- cmd-rename-session.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'cmd-rename-session.c') diff --git a/cmd-rename-session.c b/cmd-rename-session.c index 4b2c3d88..51b8ffc8 100644 --- a/cmd-rename-session.c +++ b/cmd-rename-session.c @@ -49,19 +49,15 @@ cmd_rename_session_exec(struct cmd *self, struct cmdq_item *item) struct args *args = cmd_get_args(self); struct cmd_find_state *target = cmdq_get_target(item); struct session *s = target->s; - char *newname; + char *newname, *tmp; - newname = format_single_from_target(item, args->argv[0]); + tmp = format_single_from_target(item, args->argv[0]); + newname = session_check_name(tmp); + free(tmp); if (strcmp(newname, s->name) == 0) { free(newname); return (CMD_RETURN_NORMAL); } - - if (!session_check_name(newname)) { - cmdq_error(item, "bad session name: %s", newname); - free(newname); - return (CMD_RETURN_ERROR); - } if (session_find(newname) != NULL) { cmdq_error(item, "duplicate session: %s", newname); free(newname); -- cgit