circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-07-06 10:01:22 +01:00
parent b1a8c0fe02 32f2d9d089
commit ed575182e3
4 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd-new-session.c
View File

@@ -102,6 +102,11 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
if (tmp != NULL) { if (tmp != NULL) {
name = format_single(item, tmp, c, NULL, NULL, NULL); name = format_single(item, tmp, c, NULL, NULL, NULL);
newname = session_check_name(name); newname = session_check_name(name);
if (newname == NULL) {
cmdq_error(item, "invalid session: %s", name);
free(name);
return (CMD_RETURN_ERROR);
}
free(name); free(name);
} }
if (args_has(args, 'A')) { if (args_has(args, 'A')) {
@@ -134,8 +139,14 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
prefix = xstrdup(sg->name); prefix = xstrdup(sg->name);
else if (groupwith != NULL) else if (groupwith != NULL)
prefix = xstrdup(groupwith->name); prefix = xstrdup(groupwith->name);
else else {
prefix = session_check_name(group); prefix = session_check_name(group);
if (prefix == NULL) {
cmdq_error(item, "invalid session group: %s",
group);
goto fail;
}
}
} }
/* Set -d if no client. */ /* Set -d if no client. */

5
cmd-rename-session.c
View File

@@ -53,6 +53,11 @@ cmd_rename_session_exec(struct cmd *self, struct cmdq_item *item)
tmp = format_single_from_target(item, args->argv[0]); tmp = format_single_from_target(item, args->argv[0]);
newname = session_check_name(tmp); newname = session_check_name(tmp);
if (newname == NULL) {
cmdq_error(item, "invalid session: %s", tmp);
free(tmp);
return (CMD_RETURN_ERROR);
}
free(tmp); free(tmp);
if (strcmp(newname, s->name) == 0) { if (strcmp(newname, s->name) == 0) {
free(newname); free(newname);

2
session.c
View File

@@ -235,6 +235,8 @@ session_check_name(const char *name)
{ {
char *copy, *cp, *new_name; char *copy, *cp, *new_name;
if (*name == '\0')
return (NULL);
copy = xstrdup(name); copy = xstrdup(name);
for (cp = copy; *cp != '\0'; cp++) { for (cp = copy; *cp != '\0'; cp++) {
if (*cp == ':' || *cp == '.') if (*cp == ':' || *cp == '.')

15
tmux.c
View File

@@ -207,16 +207,22 @@ make_label(const char *label, char **cause)
free(paths); free(paths);
xasprintf(&base, "%s/tmux-%ld", path, (long)uid); xasprintf(&base, "%s/tmux-%ld", path, (long)uid);
if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST) if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST) {
xasprintf(cause, "couldn't create directory %s (%s)", base,
strerror(errno));
goto fail; goto fail;
if (lstat(base, &sb) != 0) }
if (lstat(base, &sb) != 0) {
xasprintf(cause, "couldn't read directory %s (%s)", base,
strerror(errno));
goto fail; goto fail;
}
if (!S_ISDIR(sb.st_mode)) { if (!S_ISDIR(sb.st_mode)) {
errno = ENOTDIR; xasprintf(cause, "%s is not a directory", base);
goto fail; goto fail;
} }
if (sb.st_uid != uid || (sb.st_mode & S_IRWXO) != 0) { if (sb.st_uid != uid || (sb.st_mode & S_IRWXO) != 0) {
errno = EACCES; xasprintf(cause, "directory %s has unsafe permissions", base);
goto fail; goto fail;
} }
xasprintf(&path, "%s/%s", base, label); xasprintf(&path, "%s/%s", base, label);
@@ -224,7 +230,6 @@ make_label(const char *label, char **cause)
return (path); return (path);
fail: fail:
xasprintf(cause, "error creating %s (%s)", base, strerror(errno));
free(base); free(base);
return (NULL); return (NULL);
} }