mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10343 from jdgleaver/font-segfault-fix

Browse Source 
(Menu) Prevent font-related segfaults when using extremely small scales/window sizes
This commit is contained in:
Autechre 2020-03-24 18:13:32 +01:00 committed by GitHub
commit 2cc841a6cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/gfx_display.c
View File

@ -713,13 +713,19 @@ font_data_t *gfx_display_font_file(
char* fontpath, float menu_font_size, bool is_threaded) char* fontpath, float menu_font_size, bool is_threaded)
{ {
font_data_t *font_data = NULL; font_data_t *font_data = NULL;
float font_size = menu_font_size;
if (!dispctx) if (!dispctx)
return NULL; return NULL;
/* Font size must be at least 2, or font_init_first()
* will generate a heap-buffer-overflow when using
* many font drivers */
font_size = (font_size > 2.0f) ? font_size : 2.0f;
if (!dispctx->font_init_first((void**)&font_data, if (!dispctx->font_init_first((void**)&font_data,
video_driver_get_ptr(false), video_driver_get_ptr(false),
fontpath, menu_font_size, is_threaded)) fontpath, font_size, is_threaded))
return NULL; return NULL;
return font_data; return font_data;