ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpcss: Fix a file handle leak in RPCSS_BecomePipeServer(). 

Also, RPCSS_NPConnect() returns a file handle so treat it as such by
checking it against INVALID_HANDLE_VALUE and not NULL.
This commit is contained in:
Francois Gouget 2007-03-08 15:30:29 +01:00 committed by Alexandre Julliard
parent 66c37f5184
commit c69ebe3b47
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
programs/rpcss/np_server.c
View File

@ -334,7 +334,7 @@ static VOID NPMainWorkThread(LPVOID ignored)
static HANDLE RPCSS_NPConnect(void) static HANDLE RPCSS_NPConnect(void)
{ {
HANDLE the_pipe = NULL; HANDLE the_pipe;
DWORD dwmode, wait_result; DWORD dwmode, wait_result;
HANDLE master_mutex = RPCSS_GetMasterMutex(); HANDLE master_mutex = RPCSS_GetMasterMutex();
@ -371,7 +371,6 @@ static HANDLE RPCSS_NPConnect(void)
if (GetLastError() != ERROR_PIPE_BUSY) { if (GetLastError() != ERROR_PIPE_BUSY) {
WINE_WARN("Unable to open named pipe %s (assuming unavailable).\n", WINE_WARN("Unable to open named pipe %s (assuming unavailable).\n",
wine_dbgstr_a(NAME_RPCSS_NAMED_PIPE)); wine_dbgstr_a(NAME_RPCSS_NAMED_PIPE));
the_pipe = NULL;
break; break;
} }
@ -390,7 +389,7 @@ static HANDLE RPCSS_NPConnect(void)
} }
if (the_pipe) { if (the_pipe != INVALID_HANDLE_VALUE) {
dwmode = PIPE_READMODE_MESSAGE; dwmode = PIPE_READMODE_MESSAGE;
/* SetNamedPipeHandleState not implemented ATM, but still seems to work somehow. */ /* SetNamedPipeHandleState not implemented ATM, but still seems to work somehow. */
if (! SetNamedPipeHandleState(the_pipe, &dwmode, NULL, NULL)) if (! SetNamedPipeHandleState(the_pipe, &dwmode, NULL, NULL))
@ -468,12 +467,13 @@ BOOL RPCSS_BecomePipeServer(void)
* ready to listen on it * ready to listen on it
*/ */
if ((client_handle = RPCSS_NPConnect()) != NULL) { if ((client_handle = RPCSS_NPConnect()) != INVALID_HANDLE_VALUE) {
msg.message_type = RPCSS_NP_MESSAGE_TYPEID_RANMSG; msg.message_type = RPCSS_NP_MESSAGE_TYPEID_RANMSG;
msg.message.ranmsg.timeout = RPCSS_GetMaxLazyTimeout(); msg.message.ranmsg.timeout = RPCSS_GetMaxLazyTimeout();
msg.vardata_payload_size = 0; msg.vardata_payload_size = 0;
if (!RPCSS_SendReceiveNPMsg(client_handle, &msg, &reply)) if (!RPCSS_SendReceiveNPMsg(client_handle, &msg, &reply))
WINE_ERR("Something is amiss: RPC_SendReceive failed.\n"); WINE_ERR("Something is amiss: RPC_SendReceive failed.\n");
CloseHandle(client_handle);
rslt = FALSE; rslt = FALSE;
} }
if (rslt) { if (rslt) {