From: Nikita Kiryanov <nikita@compulab.co.il>
Date: Sun, 19 Aug 2012 19:32:30 +0000 (+0000)
Subject: common/lcd: add protection from null bmp pointer
X-Git-Tag: v2012.10-rc2~48^2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1b09b53e7dda7f8d4e7ec2927137f3b71327955a;p=u-boot

common/lcd: add protection from null bmp pointer

If the bmp pointer is null then U-Boot will get stuck when trying
to load the image.
What's worse, it will get stuck before the U-Boot shell becomes
available to the user, thus making it difficult to correct the
situation.

To protect from the above scenario, check if the pointer is valid.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---

diff --git a/common/lcd.c b/common/lcd.c
index 88dfa51d77..fcc09ac7a8 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -674,7 +674,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
 	unsigned long pwidth = panel_info.vl_col;
 	unsigned colors, bpix, bmp_bpix;
 
-	if (!((bmp->header.signature[0] == 'B') &&
+	if (!bmp || !((bmp->header.signature[0] == 'B') &&
 		(bmp->header.signature[1] == 'M'))) {
 		printf("Error: no valid bmp image at %lx\n", bmp_image);