Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catch issue #1069 in signertest, tlstest #1072

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −0
Open

Catch issue #1069 in signertest, tlstest #1072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions tests/compat/pipe2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,22 @@ static int setfl(int fd, int flag)
return rc;
}

/*
* Have open() temporarily use up file descriptors until reaching beyond the
* allocated sockets, then leak the ones conflicting with any of the latter.
*/
static void create_issue_1069_sentinels(int socket_vector[2])
{
int fd = open("CONIN$", O_RDONLY);
if (fd == -1 || fd > socket_vector[0] && fd > socket_vector[1]) {
return;
}
create_issue_1069_sentinels(socket_vector);
if (fd != socket_vector[0] && fd != socket_vector[1]) {
close(fd);
}
}

int socketpair(int domain, int type, int protocol, int socket_vector[2])
{
if (domain != AF_UNIX || !(type & SOCK_STREAM) || protocol != PF_UNSPEC)
Expand Down Expand Up @@ -85,6 +101,9 @@ int socketpair(int domain, int type, int protocol, int socket_vector[2])
goto err;

closesocket(listener);

create_issue_1069_sentinels(socket_vector);

return 0;

err:
Expand Down
Loading