AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-25 22:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

openpty: close slave pty fd on error

Browse Source 
When openpty() failed only the master fd was closed so far. Let's close the
slave fd as well. Also, let's unify the error handling.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2017-10-08 14:09:47 +02:00
parent e7a5745949
commit 98e0742024
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2017-10-08 Christian Brauner <christian.brauner@ubuntu.com>
* login/openpty.c (openpty): Close slave pty file descriptor on error.
2017-10-06 Joseph Myers <joseph@codesourcery.com>
* sysdeps/ieee754/ldbl-128/s_fma.c: Include <libm-alias-double.h>.

30
login/openpty.c
View File

@ -92,29 +92,24 @@ openpty (int *amaster, int *aslave, char *name,
char _buf[512];
#endif
char *buf = _buf;
int master, slave;
int master, ret = -1, slave = -1;
master = getpt ();
if (master == -1)
return -1;
if (grantpt (master))
goto fail;
goto on_error;
if (unlockpt (master))
goto fail;
goto on_error;
if (pts_name (master, &buf, sizeof (_buf)))
goto fail;
goto on_error;
slave = open (buf, O_RDWR | O_NOCTTY);
if (slave == -1)
{
if (buf != _buf)
free (buf);
goto fail;
}
goto on_error;
/* XXX Should we ignore errors here? */
if (termp)
@ -129,12 +124,19 @@ openpty (int *amaster, int *aslave, char *name,
if (name != NULL)
strcpy (name, buf);
ret = 0;
on_error:
if (ret == -1) {
close (master);
if (slave != -1)
close (slave);
}
if (buf != _buf)
free (buf);
return 0;
fail:
close (master);
return -1;
return ret;
}
libutil_hidden_def (openpty)