Skip to content

Fixes some resource leaks in rfbserver.c and sockets.c #661

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes some resource leaks in rfbserver.c and sockets.c #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2c98f2
rfbserver.c: close dirp on early return after opendir
shaue188 May 7, 2025
ae871fb
sockets.c: close sock on failure in rfbListenOnUDPPort
shaue188 May 7, 2025
697ca93
rfbserver.c: clean up client on rfbSetNonBlocking failure
shaue188 May 7, 2025
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
9 changes: 8 additions & 1 deletion src/libvncserver/rfbserver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ rfbNewTCPOrUDPClient(rfbScreenInfoPtr rfbScreen,
#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
if(!rfbSetNonBlocking(sock)) {
rfbCloseSocket(sock);
rfbCloseClient(cl);
rfbClientConnectionGone(cl);
return NULL;
}

Expand Down Expand Up @@ -1412,7 +1414,12 @@ rfbBool rfbSendDirContent(rfbClientPtr cl, int length, char *buffer)
return rfbSendFileTransferMessage(cl, rfbDirPacket, rfbADirectory, 0, 0, NULL);

/* send back the path name (necessary for links) */
if (rfbSendFileTransferMessage(cl, rfbDirPacket, rfbADirectory, 0, length, buffer)==FALSE) return FALSE;
if (rfbSendFileTransferMessage(cl, rfbDirPacket, rfbADirectory, 0, length, buffer)==FALSE) {
#ifndef WIN32
closedir(dirp);
#endif
return FALSE;
}

#ifdef WIN32
while (findHandle != INVALID_HANDLE_VALUE)
Expand Down
2 changes: 2 additions & 0 deletions src/libvncserver/sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,9 +1213,11 @@ rfbListenOnUDPPort(int port,
}
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
(const char *)&one, sizeof(one)) < 0) {
rfbCloseSocket(sock);
return RFB_INVALID_SOCKET;
}
if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
rfbCloseSocket(sock);
return RFB_INVALID_SOCKET;
}

Expand Down
Loading