leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'efi-2021-10-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi

Browse Source 
Pull request for efi-2021-10-rc2

Documentation:

* handle 'make htmldocs' warnings as errors
* add missing board/ti/index.rst

Bug fixes:

* avoid buffer overrun in TrueType console
* lib: disable CONFIG_SPL_HEXDUMP by default
This commit is contained in:
Tom Rini
2021-08-02 08:54:23 -04:00
parent 99bb5f248a 78e6b871fd
commit 73994c452f
9 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/video/console_truetype.c
View File

@@ -128,38 +128,36 @@ static int console_truetype_set_row(struct udevice *dev, uint row, int clr)
struct video_priv *vid_priv = dev_get_uclass_priv(dev->parent);
struct console_tt_priv *priv = dev_get_priv(dev);
void *end, *line;
int pixels = priv->font_size * vid_priv->line_length;
int i, ret;
int ret;
line = vid_priv->fb + row * priv->font_size * vid_priv->line_length;
end = line + priv->font_size * vid_priv->line_length;
switch (vid_priv->bpix) {
#ifdef CONFIG_VIDEO_BPP8
case VIDEO_BPP8: {
uint8_t *dst = line;
u8 *dst;
for (i = 0; i < pixels; i++)
*dst++ = clr;
end = dst;
for (dst = line; dst < (u8 *)end; ++dst)
*dst = clr;
break;
}
#endif
#ifdef CONFIG_VIDEO_BPP16
case VIDEO_BPP16: {
uint16_t *dst = line;
u16 *dst = line;
for (i = 0; i < pixels; i++)
*dst++ = clr;
end = dst;
for (dst = line; dst < (u16 *)end; ++dst)
*dst = clr;
break;
}
#endif
#ifdef CONFIG_VIDEO_BPP32
case VIDEO_BPP32: {
uint32_t *dst = line;
u32 *dst = line;
for (i = 0; i < pixels; i++)
*dst++ = clr;
end = dst;
for (dst = line; dst < (u32 *)end; ++dst)
*dst = clr;
break;
}
#endif