From 9344677cf45db5aac61066caec5cf4fc56c2b018 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 21 May 2013 15:58:12 +0200 Subject: bsp/qoriq: Avoid NULL pointer access --- c/src/lib/libbsp/powerpc/qoriq/console/console-config.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c b/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c index 3947a27aba..b1d2847c5c 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c +++ b/c/src/lib/libbsp/powerpc/qoriq/console/console-config.c @@ -187,12 +187,18 @@ console_tbl Console_Configuration_Ports [CONSOLE_COUNT] = { static void output_char(char c) { - const console_fns *con = Console_Port_Tbl [Console_Port_Minor]->pDeviceFns; - - if (c == '\n') { - con->deviceWritePolled((int) Console_Port_Minor, '\r'); + int minor = (int) Console_Port_Minor; + const console_tbl **ct_tbl = Console_Port_Tbl; + + if (ct_tbl != NULL) { + const console_fns *cf = ct_tbl[minor]->pDeviceFns; + + if (c == '\n') { + (*cf->deviceWritePolled)(minor, '\r'); + } + + (*cf->deviceWritePolled)(minor, c); } - con->deviceWritePolled((int) Console_Port_Minor, c); } BSP_output_char_function_type BSP_output_char = output_char; -- cgit v1.2.3