thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0827: Coverity: could leak pty file descriptor

Browse Source 
Problem:    Coverity: could leak pty file descriptor, theoretically.
Solution:   If channel is NULL, free the file descriptors.
This commit is contained in:
Bram Moolenaar
2017-08-01 15:08:07 +02:00
parent 662d938666
commit 979e8c5346
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/os_unix.c
View File

@@ -4150,6 +4150,11 @@ set_default_child_environment(void)
#endif #endif
#if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL) #if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL)
/*
* Open a PTY, with FD for the master and slave side.
* When failing "pty_master_fd" and "pty_slave_fd" are -1.
* When successful both file descriptors are stored.
*/
static void static void
open_pty(int *pty_master_fd, int *pty_slave_fd) open_pty(int *pty_master_fd, int *pty_slave_fd)
{ {
@@ -5380,6 +5385,17 @@ mch_job_start(char **argv, job_T *job, jobopt_T *options)
? INVALID_FD : fd_err[0] < 0 ? pty_master_fd : fd_err[0]); ? INVALID_FD : fd_err[0] < 0 ? pty_master_fd : fd_err[0]);
channel_set_job(channel, job, options); channel_set_job(channel, job, options);
} }
else
{
if (fd_in[1] >= 0)
close(fd_in[1]);
if (fd_out[0] >= 0)
close(fd_out[0]);
if (fd_err[0] >= 0)
close(fd_err[0]);
if (pty_master_fd >= 0)
close(pty_master_fd);
}
/* success! */ /* success! */
return; return;

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
827,
/**/ /**/
826, 826,
/**/ /**/