From 74dc9aa33502ba89333ab4be3c7c1458015c1d56 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Tue, 1 Sep 2020 17:22:20 -0500 Subject: [PATCH] server: Avoid a potential NULL dereference in startup_info_dump(). info->data may be set to NULL by get_startup_info, without invalidating the object itself. Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard --- server/process.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/process.c b/server/process.c index c1bdb591f60..9bf5e447d37 100644 --- a/server/process.c +++ b/server/process.c @@ -749,8 +749,11 @@ static void startup_info_dump( struct object *obj, int verbose ) struct startup_info *info = (struct startup_info *)obj; assert( obj->ops == &startup_info_ops ); - fprintf( stderr, "Startup info in=%04x out=%04x err=%04x\n", - info->data->hstdin, info->data->hstdout, info->data->hstderr ); + fputs( "Startup info", stderr ); + if (info->data) + fprintf( stderr, " in=%04x out=%04x err=%04x", + info->data->hstdin, info->data->hstdout, info->data->hstderr ); + fputc( '\n', stderr ); } static int startup_info_signaled( struct object *obj, struct wait_queue_entry *entry )