michaelh/zephyr
1
0
Fork 0
Code Releases Activity

fb: Fix possible NULL pointer de-reference

Browse source 
ftpr assignment is being done before checking fb->fonts pointer.
Just changing assignment position.

Fixes 23299 [1]

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2020-03-16 15:03:30 -07:00 • committed by Maureen Helm
commit 841b6ab990
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/fb/cfb.c
View file

@ -106,12 +106,14 @@ static u8_t draw_char_vtmono(const struct char_framebuffer *fb,
int cfb_print(struct device *dev, char *str, u16_t x, u16_t y) int cfb_print(struct device *dev, char *str, u16_t x, u16_t y)
{ {
const struct char_framebuffer *fb = &char_fb; const struct char_framebuffer *fb = &char_fb;
const struct cfb_font *fptr = &(fb->fonts[fb->font_idx]); const struct cfb_font *fptr;
if (!fb->fonts || !fb->buf) { if (!fb->fonts || !fb->buf) {
return -1; return -1;
} }
fptr = &(fb->fonts[fb->font_idx]);
if (fptr->height % 8) { if (fptr->height % 8) {
LOG_ERR("Wrong font size"); LOG_ERR("Wrong font size");
return -1; return -1;