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

tty.path can be NULL, don't dereference it. From George Nachman.

Browse Source
This commit is contained in:
Nicholas Marriott
2013-03-04 09:02:32 +00:00
parent 1da64bf786
commit 43d904dbf3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-choose-client.c
View File

@@ -79,7 +79,7 @@ cmd_choose_client_exec(struct cmd *self, struct cmd_q *cmdq)
cur = idx = 0; cur = idx = 0;
for (i = 0; i < ARRAY_LENGTH(&clients); i++) { for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c1 = ARRAY_ITEM(&clients, i); c1 = ARRAY_ITEM(&clients, i);
if (c1 == NULL || c1->session == NULL) if (c1 == NULL || c1->session == NULL || c1->tty.path == NULL)
continue; continue;
if (c1 == cmdq->client) if (c1 == cmdq->client)
cur = idx; cur = idx;

8
cmd.c
View File

@@ -326,9 +326,9 @@ cmd_current_session(struct cmd_q *cmdq, int prefer_unattached)
return (c->session); return (c->session);
/* /*
* If the name of the calling client's pty is know, build a list of the * If the name of the calling client's pty is known, build a list of
* sessions that contain it and if any choose either the first or the * the sessions that contain it and if any choose either the first or
* newest. * the newest.
*/ */
path = c == NULL ? NULL : c->tty.path; path = c == NULL ? NULL : c->tty.path;
if (path != NULL) { if (path != NULL) {
@@ -531,7 +531,7 @@ cmd_lookup_client(const char *name)
for (i = 0; i < ARRAY_LENGTH(&clients); i++) { for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i); c = ARRAY_ITEM(&clients, i);
if (c == NULL || c->session == NULL) if (c == NULL || c->session == NULL || c->tty.path == NULL)
continue; continue;
path = c->tty.path; path = c->tty.path;