circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Instead of forbidding invalid session names, sanitize them like window

Browse Source 
names.
This commit is contained in:
nicm
2020-05-16 14:49:50 +00:00
parent 7dbe623156
commit 428137d876
3 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
session.c
View File

@ -23,6 +23,7 @@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <vis.h>
#include <time.h>
#include "tmux.h"
@ -123,7 +124,6 @@ session_create(const char *prefix, const char *name, const char *cwd,
s->cwd = xstrdup(cwd);
s->curw = NULL;
TAILQ_INIT(&s->lastw);
RB_INIT(&s->windows);
@ -142,7 +142,6 @@ session_create(const char *prefix, const char *name, const char *cwd,
s->name = xstrdup(name);
s->id = next_session_id++;
} else {
s->name = NULL;
do {
s->id = next_session_id++;
free(s->name);
@ -232,11 +231,20 @@ session_destroy(struct session *s, int notify, const char *from)
session_remove_ref(s, __func__);
}
/* Check a session name is valid: not empty and no colons or periods. */
int
/* Sanitize session name. */
char *
session_check_name(const char *name)
{
return (*name != '\0' && name[strcspn(name, ":.")] == '\0');
char *copy, *cp, *new_name;
copy = xstrdup(name);
for (cp = copy; *cp != '\0'; cp++) {
if (*cp == ':' || *cp == '.')
*cp = '_';
}
utf8_stravis(&new_name, copy, VIS_OCTAL|VIS_CSTYLE|VIS_TAB|VIS_NL);
free(copy);
return (new_name);
}
/* Lock session if it has timed out. */
@ -556,6 +564,7 @@ session_group_remove(struct session *s)
TAILQ_REMOVE(&sg->sessions, s, gentry);
if (TAILQ_EMPTY(&sg->sessions)) {
RB_REMOVE(session_groups, &session_groups, sg);
free((void *)sg->name);
free(sg);
}
}