Skip to content

libvncserver: close resources on error paths #709

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
marcofortina wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −2
Open

libvncserver: close resources on error paths #709

Show file tree
Hide file tree
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
13 changes: 12 additions & 1 deletion src/libvncserver/rfbserver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,10 @@ rfbNewTCPOrUDPClient(rfbScreenInfoPtr rfbScreen,
#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
if(!rfbSetNonBlocking(sock)) {
rfbCloseSocket(sock);
free(cl->host);
if (cl->scaledScreen != NULL)
cl->scaledScreen->scaledScreenRefCount--;
free(cl);
return NULL;
}

Expand Down Expand Up @@ -1482,7 +1486,14 @@ 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) {
#ifdef WIN32
FindClose(findHandle);
#else
closedir(dirp);
#endif
return FALSE;
}

#ifdef WIN32
while (findHandle != INVALID_HANDLE_VALUE)
Expand Down
4 changes: 3 additions & 1 deletion src/libvncserver/sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,8 +1208,10 @@ rfbConnectToTcpAddr(char *host,
sock = RFB_INVALID_SOCKET; /* set return value */
} else {
/* one succeeded, re-set to blocking */
if (!sock_set_nonblocking(sock, FALSE, rfbErr))
if (!sock_set_nonblocking(sock, FALSE, rfbErr)) {
rfbCloseSocket(sock);
sock = RFB_INVALID_SOCKET;
}
}

/* all done with this structure now */
Expand Down
Loading