projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
83fe323
)
Merge branch 'master' of git://www.denx.de/git/u-boot-video
author
Wolfgang Denk
<wd@denx.de>
Thu, 24 Apr 2008 12:00:54 +0000
(14:00 +0200)
committer
Wolfgang Denk
<wd@denx.de>
Thu, 24 Apr 2008 12:00:54 +0000
(14:00 +0200)
drivers/video/cfb_console.c
patch
|
blob
|
history
diff --git
a/drivers/video/cfb_console.c
b/drivers/video/cfb_console.c
index
4f73067
..
68b9861
100644
(file)
--- 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;
}