summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2012-08-19 19:32:30 +0000
committerAnatolij Gustschin <agust@denx.de>2012-09-21 23:41:56 +0200
commit1b09b53e7dda7f8d4e7ec2927137f3b71327955a (patch)
treea1172dba5c830358ac395235f76605c4c836a65d
parentbfdcc65e1163b4891643c2a670570c478b9af2a4 (diff)
downloadu-boot-imx-1b09b53e7dda7f8d4e7ec2927137f3b71327955a.zip
u-boot-imx-1b09b53e7dda7f8d4e7ec2927137f3b71327955a.tar.gz
u-boot-imx-1b09b53e7dda7f8d4e7ec2927137f3b71327955a.tar.bz2
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>
-rw-r--r--common/lcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/lcd.c b/common/lcd.c
index 88dfa51..fcc09ac 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);