diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-24 14:00:54 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-24 14:00:54 +0200 |
| commit | be32bf20bc5bbf3e8cf07085743bbc8f05630812 (patch) | |
| tree | e1830f0a0bd45e35f361e3f237721bf08ae45c68 /drivers/video/cfb_console.c | |
| parent | 83fe32334337def160b302aa9d152d808bfcc68e (diff) | |
| parent | a49e0d177a0749614b316ec847fb623f09c82c07 (diff) | |
| download | u-boot-imx-be32bf20bc5bbf3e8cf07085743bbc8f05630812.zip u-boot-imx-be32bf20bc5bbf3e8cf07085743bbc8f05630812.tar.gz u-boot-imx-be32bf20bc5bbf3e8cf07085743bbc8f05630812.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-video
Diffstat (limited to 'drivers/video/cfb_console.c')
| -rw-r--r-- | drivers/video/cfb_console.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 4f73067..68b9861 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -849,6 +849,7 @@ int video_display_bitmap (ulong bmp_image, int x, int y) if (!((bmp->header.signature[0] == 'B') && (bmp->header.signature[1] == 'M'))) { printf ("Error: no valid bmp.gz image at %lx\n", bmp_image); + free(dst); return 1; } #else @@ -869,6 +870,10 @@ int video_display_bitmap (ulong bmp_image, int x, int y) if (compression != BMP_BI_RGB) { printf ("Error: compression type %ld not supported\n", compression); +#ifdef CONFIG_VIDEO_BMP_GZIP + if (dst) + free(dst); +#endif return 1; } |