summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-10-13 01:55:58 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-10-13 01:55:58 +0200
commitcbdf8824faaeab6f989bee60443987ef6272e77a (patch)
tree37548b5e8680fbf4b93c8ed9d39b2d4020c4ef2b /drivers
parentb604a40b4f802e045c273344f3d9f553f9193f3e (diff)
parent4f92ac3648483cef34eadf69da1f0895a5a148d8 (diff)
downloadu-boot-imx-cbdf8824faaeab6f989bee60443987ef6272e77a.zip
u-boot-imx-cbdf8824faaeab6f989bee60443987ef6272e77a.tar.gz
u-boot-imx-cbdf8824faaeab6f989bee60443987ef6272e77a.tar.bz2
Merge with /home/sr/git/u-boot
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cfb_console.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/cfb_console.c b/drivers/cfb_console.c
index aba4a03..82b35e5 100644
--- a/drivers/cfb_console.c
+++ b/drivers/cfb_console.c
@@ -779,11 +779,18 @@ int video_display_bitmap (ulong bmp_image, int x, int y)
*/
len = CFG_VIDEO_LOGO_MAX_SIZE;
dst = malloc(CFG_VIDEO_LOGO_MAX_SIZE);
+ if (dst == NULL) {
+ printf("Error: malloc in gunzip failed!\n");
+ return(1);
+ }
if (gunzip(dst, CFG_VIDEO_LOGO_MAX_SIZE, (uchar *)bmp_image, &len) != 0) {
printf ("Error: no valid bmp or bmp.gz image at %lx\n", bmp_image);
free(dst);
return 1;
}
+ if (len == CFG_VIDEO_LOGO_MAX_SIZE) {
+ printf("Image could be truncated (increase CFG_VIDEO_LOGO_MAX_SIZE)!\n");
+ }
/*
* Set addr to decompressed image