vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gfxmenu: Fix double free in load_image() 

self->bitmap should be zeroed after free. Otherwise, there is a chance
to double free (USE_AFTER_FREE) it later in rescale_image().

Fixes: CID 292472

Signed-off-by: Alexey Makhalov <amakhalov@vmware.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Alexey Makhalov 2020-07-08 20:41:56 +00:00 committed by Daniel Kiper
parent 89f3da1a3d
commit 26a8c19307
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grub-core/gfxmenu/gui_image.c
View File

@ -195,7 +195,10 @@ load_image (grub_gui_image_t self, const char *path)
return grub_errno;
if (self->bitmap && (self->bitmap != self->raw_bitmap))
grub_video_bitmap_destroy (self->bitmap);
{
grub_video_bitmap_destroy (self->bitmap);
self->bitmap = 0;
}
if (self->raw_bitmap)
grub_video_bitmap_destroy (self->raw_bitmap);