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

server: Avoid leaking file descriptors if create_console_input fails.

This commit is contained in:
Sebastian Lackner 2014-11-17 19:15:20 +01:00 committed by Alexandre Julliard
parent 35c7ac8a0b
commit 609d43e408
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/console.c
View File

@ -299,7 +299,11 @@ static struct object *create_console_input( struct thread* renderer, int fd )
{ {
struct console_input *console_input; struct console_input *console_input;
if (!(console_input = alloc_object( &console_input_ops ))) return NULL; if (!(console_input = alloc_object( &console_input_ops )))
{
if (fd != -1) close( fd );
return NULL;
}
console_input->renderer = renderer; console_input->renderer = renderer;
console_input->mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | console_input->mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT |
ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE |
@ -323,8 +327,9 @@ static struct object *create_console_input( struct thread* renderer, int fd )
if (!console_input->history || (renderer && !console_input->evt) || !console_input->event) if (!console_input->history || (renderer && !console_input->evt) || !console_input->event)
{ {
release_object( console_input ); if (fd != -1) close( fd );
return NULL; release_object( console_input );
return NULL;
} }
if (fd != -1) /* bare console */ if (fd != -1) /* bare console */
{ {