mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 03:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent some null pointer dereferences

Browse Source
This commit is contained in:
twinaphex 2016-10-20 00:30:34 +02:00
parent ddb4f85430
commit 86eed6706e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/font_driver.c
View File

@ -283,7 +283,7 @@ void font_driver_render_msg(void *font_data,
const char *msg, const struct font_params *params)
{
font_data_t *font = (font_data_t*)(font_data ? font_data : g_osd_font);
if (font && font->renderer->render_msg)
if (font && font->renderer && font->renderer->render_msg)
font->renderer->render_msg(font->renderer_data, msg, params);
}
@ -291,14 +291,14 @@ void font_driver_bind_block(void *font_data, void *block)
{
font_data_t *font = (font_data_t*)(font_data ? font_data : g_osd_font);
if (font->renderer && font->renderer->bind_block)
if (font && font->renderer && font->renderer->bind_block)
font->renderer->bind_block(font->renderer_data, block);
}
void font_driver_flush(void *font_data)
{
font_data_t *font = (font_data_t*)(font_data ? font_data : g_osd_font);
if (font->renderer && font->renderer->flush)
if (font && font->renderer && font->renderer->flush)
font->renderer->flush(font->renderer_data);
}
@ -306,9 +306,9 @@ int font_driver_get_message_width(void *font_data,
const char *msg, unsigned len, float scale)
{
font_data_t *font = (font_data_t*)(font_data ? font_data : g_osd_font);
if (!font->renderer || !font->renderer->get_message_width)
return -1;
return font->renderer->get_message_width(font->renderer_data, msg, len, scale);
if (font && font->renderer && font->renderer->get_message_width)
return font->renderer->get_message_width(font->renderer_data, msg, len, scale);
return -1;
}
void font_driver_free(void *font_data)