diff options
Diffstat (limited to 'src/lib/bootsplash.c')
| -rw-r--r-- | src/lib/bootsplash.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/lib/bootsplash.c b/src/lib/bootsplash.c index 3ab11aca6f..0512770668 100644 --- a/src/lib/bootsplash.c +++ b/src/lib/bootsplash.c @@ -14,34 +14,40 @@ void set_bootsplash(unsigned char *framebuffer, unsigned int x_resolution, unsigned int y_resolution, unsigned int bytes_per_line, unsigned int fb_resolution) { + if ((x_resolution > INT_MAX) || (y_resolution) > INT_MAX) { + printk(BIOS_ERR, "Display resolution way too large.\n"); + return; + } + int xres = x_resolution, yres = y_resolution; printk(BIOS_INFO, "Setting up bootsplash in %dx%d@%d\n", x_resolution, y_resolution, fb_resolution); - struct jpeg_decdata *decdata; - unsigned char *jpeg = cbfs_map("bootsplash.jpg", NULL); + size_t filesize; + unsigned char *jpeg = cbfs_map("bootsplash.jpg", &filesize); if (!jpeg) { printk(BIOS_ERR, "Could not find bootsplash.jpg\n"); return; } - int image_width, image_height; - jpeg_fetch_size(jpeg, &image_width, &image_height); + unsigned int image_width, image_height; + if (jpeg_fetch_size(jpeg, filesize, &image_width, &image_height) != 0) { + printk(BIOS_ERR, "Could not parse bootsplash.jpg\n"); + return; + } printk(BIOS_DEBUG, "Bootsplash image resolution: %dx%d\n", image_width, image_height); - if (image_width > x_resolution || image_height > y_resolution) { + if (image_width > xres || image_height > yres) { printk(BIOS_NOTICE, "Bootsplash image can't fit framebuffer.\n"); cbfs_unmap(jpeg); return; } /* center image: */ - framebuffer += (y_resolution - image_height) / 2 * bytes_per_line + - (x_resolution - image_width) / 2 * (fb_resolution / 8); + framebuffer += (yres - image_height) / 2 * bytes_per_line + + (xres - image_width) / 2 * (fb_resolution / 8); - decdata = malloc(sizeof(*decdata)); - int ret = jpeg_decode(jpeg, framebuffer, image_width, image_height, - bytes_per_line, fb_resolution, decdata); - free(decdata); + int ret = jpeg_decode(jpeg, filesize, framebuffer, image_width, image_height, + bytes_per_line, fb_resolution); cbfs_unmap(jpeg); if (ret != 0) { printk(BIOS_ERR, "Bootsplash could not be decoded. jpeg_decode returned %d.\n", |