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

server: Ensure we set proper errors when getting a NULL fd out of a handle.

This commit is contained in:
Eric Pouech 2010-09-16 21:05:26 +02:00 committed by Alexandre Julliard
parent 190c3518d6
commit 687b3dc25c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/console.c
View File

@ -193,7 +193,10 @@ static struct fd *console_input_get_fd( struct object* obj )
{ {
struct console_input *console_input = (struct console_input*)obj; struct console_input *console_input = (struct console_input*)obj;
assert( obj->ops == &console_input_ops ); assert( obj->ops == &console_input_ops );
return console_input->fd ? (struct fd*)grab_object( console_input->fd ) : NULL; if (console_input->fd)
return (struct fd*)grab_object( console_input->fd );
set_error( STATUS_OBJECT_TYPE_MISMATCH );
return NULL;
} }
static enum server_fd_type console_get_fd_type( struct fd *fd ) static enum server_fd_type console_get_fd_type( struct fd *fd )
@ -1144,7 +1147,10 @@ static struct fd *screen_buffer_get_fd( struct object *obj )
{ {
struct screen_buffer *screen_buffer = (struct screen_buffer*)obj; struct screen_buffer *screen_buffer = (struct screen_buffer*)obj;
assert( obj->ops == &screen_buffer_ops ); assert( obj->ops == &screen_buffer_ops );
return screen_buffer->fd ? (struct fd*)grab_object( screen_buffer->fd ) : NULL; if (screen_buffer->fd)
return (struct fd*)grab_object( screen_buffer->fd );
set_error( STATUS_OBJECT_TYPE_MISMATCH );
return NULL;
} }
/* write data into a screen buffer */ /* write data into a screen buffer */