Fixed buffer overflow in bmp_load()
This commit is contained in:
@@ -149,6 +149,9 @@ void lcd_bmp(coord_t x, coord_t y, const uint8_t * img, uint8_t offset, uint8_t
|
|||||||
width = w;
|
width = w;
|
||||||
}
|
}
|
||||||
if (x+width > LCD_W) {
|
if (x+width > LCD_W) {
|
||||||
|
if (x >= LCD_W ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
width = LCD_W-x;
|
width = LCD_W-x;
|
||||||
}
|
}
|
||||||
uint8_t rows = (*q++ + 1) / 2;
|
uint8_t rows = (*q++ + 1) / 2;
|
||||||
@@ -157,6 +160,9 @@ void lcd_bmp(coord_t x, coord_t y, const uint8_t * img, uint8_t offset, uint8_t
|
|||||||
q = img + 2 + row*w + offset;
|
q = img + 2 + row*w + offset;
|
||||||
uint8_t *p = &displayBuf[(row + (y/2)) * LCD_W + x];
|
uint8_t *p = &displayBuf[(row + (y/2)) * LCD_W + x];
|
||||||
for (coord_t i=0; i<width; i++) {
|
for (coord_t i=0; i<width; i++) {
|
||||||
|
if ((p) >= DISPLAY_END) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
uint8_t b = *q++;
|
uint8_t b = *q++;
|
||||||
if (y & 1) {
|
if (y & 1) {
|
||||||
*p = (*p & 0x0f) + ((b & 0x0f) << 4);
|
*p = (*p & 0x0f) + ((b & 0x0f) << 4);
|
||||||
|
|||||||
@@ -264,6 +264,8 @@ TEST(Lcd, BMPWrapping)
|
|||||||
bmpLoad(bitmap, "./tests/plane.bmp", 40, 40);
|
bmpLoad(bitmap, "./tests/plane.bmp", 40, 40);
|
||||||
lcd_bmp(200, 0, bitmap);
|
lcd_bmp(200, 0, bitmap);
|
||||||
lcd_bmp(200, 60, bitmap);
|
lcd_bmp(200, 60, bitmap);
|
||||||
|
lcd_bmp(240, 60, bitmap); // x too big
|
||||||
|
lcd_bmp(20, 200, bitmap); // y too big
|
||||||
EXPECT_TRUE(checkScreenshot("bmpwrapping"));
|
EXPECT_TRUE(checkScreenshot("bmpwrapping"));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user