Sebastian Lackner : server: Avoid invalid memory accesses when create_console_output fails.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0f133aedd5f1d3a5e8dd84790954247f2bcebd8a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0f133aedd5f1d3a5e8dd847909...

Author: Sebastian Lackner <sebastian(a)fds-team.de>
Date:   Wed Aug 19 12:15:01 2015 +0200

server: Avoid invalid memory accesses when create_console_output fails.

---

 server/console.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/console.c b/server/console.c
index 218831b..0bb1824 100644
--- a/server/console.c
+++ b/server/console.c
@@ -409,6 +409,9 @@ static struct screen_buffer *create_console_output( struct console_input *consol
     screen_buffer->win.right      = screen_buffer->max_width - 1;
     screen_buffer->win.top        = 0;
     screen_buffer->win.bottom     = screen_buffer->max_height - 1;
+    screen_buffer->data           = NULL;
+    list_add_head( &screen_buffer_list, &screen_buffer->entry );
+
     if (fd == -1)
         screen_buffer->fd = NULL;
     else
@@ -422,8 +425,6 @@ static struct screen_buffer *create_console_output( struct console_input *consol
         allow_fd_caching(screen_buffer->fd);
     }
 
-    list_add_head( &screen_buffer_list, &screen_buffer->entry );
-
     if (!(screen_buffer->data = malloc( screen_buffer->width * screen_buffer->height *
                                         sizeof(*screen_buffer->data) )))
     {