From 021414a33248f9c1f6eb4a676f4a1fbcfa26f475 Mon Sep 17 00:00:00 2001 From: "xypron.glpk@gmx.de" Date: Sun, 30 Jul 2017 21:59:23 +0200 Subject: [PATCH] lcd: avoid possible NULL dereference Do not dereference bmp before the check if it is NULL. The problem was indicated by cppcheck. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass Reviewed-by: Philipp Tomsich --- common/lcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/lcd.c b/common/lcd.c index c3ff959..4b3d7dc 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -578,7 +578,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) unsigned long pwidth = panel_info.vl_col; unsigned colors, bpix, bmp_bpix; int hdr_size; - struct bmp_color_table_entry *palette = bmp->color_table; + struct bmp_color_table_entry *palette; if (!bmp || !(bmp->header.signature[0] == 'B' && bmp->header.signature[1] == 'M')) { @@ -587,6 +587,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) return 1; } + palette = bmp->color_table; width = get_unaligned_le32(&bmp->header.width); height = get_unaligned_le32(&bmp->header.height); bmp_bpix = get_unaligned_le16(&bmp->header.bit_count);