taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

do not potentially pass -1 to fcntl()

Browse Source
This commit is contained in:
Christian Grothoff 2017-10-06 21:06:47 +02:00
parent 06f5621fba
commit 800c54b19e
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/exchange/taler-exchange-httpd.c
View File

@ -1015,37 +1015,54 @@ main (int argc,
listen_fds = getenv ("LISTEN_FDS");
if ( (NULL != listen_pid) &&
(NULL != listen_fds) &&
(getpid() == strtol (listen_pid, NULL, 10)) &&
( (1 == strtoul (listen_fds, NULL, 10)) ||
(2 == strtoul (listen_fds, NULL, 10)) ) )
(getpid() == strtol (listen_pid,
NULL,
10)) &&
( (1 == strtoul (listen_fds,
NULL,
10)) ||
(2 == strtoul (listen_fds,
NULL,
10)) ) )
{
int flags;
fh = 3;
flags = fcntl (fh, F_GETFD);
if ( (-1 == flags) && (EBADF == errno) )
flags = fcntl (fh,
F_GETFD);
if ( (-1 == flags) &&
(EBADF == errno) )
{
fprintf (stderr,
"Bad listen socket passed, ignored\n");
fh = -1;
}
flags |= FD_CLOEXEC;
if (0 != fcntl (fh, F_SETFD, flags))
if ( (-1 != fh) &&
(0 != fcntl (fh,
F_SETFD,
flags)) )
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
"fcntl");
if (2 == strtoul (listen_fds, NULL, 10))
if (2 == strtoul (listen_fds,
NULL,
10))
{
fh_admin = 4;
flags = fcntl (fh_admin, F_GETFD);
if ( (-1 == flags) && (EBADF == errno) )
flags = fcntl (fh_admin,
F_GETFD);
if ( (-1 == flags) &&
(EBADF == errno) )
{
fprintf (stderr,
"Bad listen socket passed, ignored\n");
fh_admin = -1;
}
flags |= FD_CLOEXEC;
if (0 != fcntl (fh_admin, F_SETFD, flags))
if (0 != fcntl (fh_admin,
F_SETFD,
flags))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
"fcntl");
}