mirror of
https://github.com/tmux/tmux.git
synced 2024-12-25 02:48:47 +00:00
Fix previous not to leak fd on failure, whoops.
This commit is contained in:
parent
3d8a8ea0c6
commit
9f330897a8
16
tmux.c
16
tmux.c
@ -127,23 +127,25 @@ areshell(const char *shell)
|
|||||||
const char*
|
const char*
|
||||||
get_full_path(const char *wd, const char *path)
|
get_full_path(const char *wd, const char *path)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
static char newpath[MAXPATHLEN];
|
static char newpath[MAXPATHLEN];
|
||||||
|
const char *retval;
|
||||||
|
|
||||||
fd = open(".", O_RDONLY);
|
fd = open(".", O_RDONLY);
|
||||||
if (fd == -1)
|
if (fd == -1)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
|
|
||||||
if (chdir(wd) != 0)
|
retval = NULL;
|
||||||
return (NULL);
|
if (chdir(wd) == 0) {
|
||||||
if (realpath(path, newpath) != 0)
|
if (realpath(path, newpath) == 0)
|
||||||
return (NULL);
|
retval = newpath;
|
||||||
|
}
|
||||||
|
|
||||||
if (fchdir(fd) != 0)
|
if (fchdir(fd) != 0)
|
||||||
chdir("/");
|
chdir("/");
|
||||||
close(fd);
|
close(fd);
|
||||||
|
|
||||||
return (newpath);
|
return (retval);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
Loading…
Reference in New Issue
Block a user