Commit 4ec9e110 authored by Alexandre Julliard's avatar Alexandre Julliard

server: Return an error for invalid requests instead of killing the client process.

parent ee48e1e3
...@@ -52,9 +52,12 @@ ...@@ -52,9 +52,12 @@
#include <poll.h> #include <poll.h>
#endif #endif
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wincon.h" #include "wincon.h"
#include "winternl.h"
#include "wine/library.h" #include "wine/library.h"
#include "file.h" #include "file.h"
...@@ -277,23 +280,22 @@ static void call_req_handler( struct thread *thread ) ...@@ -277,23 +280,22 @@ static void call_req_handler( struct thread *thread )
if (debug_level) trace_request(); if (debug_level) trace_request();
if (req < REQ_NB_REQUESTS) if (req < REQ_NB_REQUESTS)
{
req_handlers[req]( &current->req, &reply ); req_handlers[req]( &current->req, &reply );
if (current) else
set_error( STATUS_NOT_IMPLEMENTED );
if (current)
{
if (current->reply_fd)
{ {
if (current->reply_fd) reply.reply_header.error = current->error;
{ reply.reply_header.reply_size = current->reply_size;
reply.reply_header.error = current->error; if (debug_level) trace_reply( req, &reply );
reply.reply_header.reply_size = current->reply_size; send_reply( &reply );
if (debug_level) trace_reply( req, &reply );
send_reply( &reply );
}
else fatal_protocol_error( current, "no reply fd for request %d\n", req );
} }
current = NULL; else fatal_protocol_error( current, "no reply fd for request %d\n", req );
return;
} }
fatal_protocol_error( current, "bad request %d\n", req ); current = NULL;
} }
/* read a request from a thread */ /* read a request from a thread */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment