summaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2009-02-18 15:28:43 +0000
committerBernhard Reutner-Fischer2009-02-18 15:28:43 +0000
commit7307e06122997f3d5e0108cd1bab4b11a1d5ebdc (patch)
treed09cc810940608072ea56d070b9811d0da3dfe25 /miscutils
parent8dcb33c3eb97ca668f609baf790fc79ac3f9da1c (diff)
downloadbusybox-7307e06122997f3d5e0108cd1bab4b11a1d5ebdc.zip
busybox-7307e06122997f3d5e0108cd1bab4b11a1d5ebdc.tar.gz
- bail out if screen resolution does not match PPM dimensions.
Previously a 640x480 PPM on an e.g. 720x400 console would just segfault when reading the lines. While this bug should perhaps be fixed to handle such cases properly we just exit gracefully until somebody is willing to take care of it properly.
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/fbsplash.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 1ea5d8e..ec0f092 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -257,7 +257,9 @@ static void fb_drawimage(void)
if (ENABLE_FEATURE_CLEAN_UP)
free(head);
-
+ if (width != G.scr_var.xres || height != G.scr_var.yres)
+ bb_error_msg_and_die("PPM %dx%d does not match screen %dx%d",
+ width, height, G.scr_var.xres, G.scr_var.yres);
line_size = width*3;
if (width > G.scr_var.xres)
width = G.scr_var.xres;