From 695ff2a29964cf3346966e4106a0ed18f3a9abba Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 6 Nov 2016 18:44:55 +0100 Subject: [PATCH] (sdl_gl_ctx.c) Prevent some implicit memsets --- gfx/drivers_context/sdl_gl_ctx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gfx/drivers_context/sdl_gl_ctx.c b/gfx/drivers_context/sdl_gl_ctx.c index 98bf267543..6bbf680b1e 100644 --- a/gfx/drivers_context/sdl_gl_ctx.c +++ b/gfx/drivers_context/sdl_gl_ctx.c @@ -269,14 +269,16 @@ static void sdl_ctx_get_video_size(void *data, static void sdl_ctx_update_window_title(void *data) { - char buf[128] = {0}; - char buf_fps[128] = {0}; + char buf[128]; + char buf_fps[128]; settings_t *settings = config_get_ptr(); gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)data; if (!sdl) return; + buf[0] = buf_fps[0] = '\0'; + if (video_monitor_get_fps(buf, sizeof(buf), buf_fps, sizeof(buf_fps))) { @@ -382,7 +384,8 @@ static void sdl_ctx_swap_buffers(void *data) { #ifdef HAVE_SDL2 gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)data; - SDL_GL_SwapWindow(sdl->g_win); + if (sdl) + SDL_GL_SwapWindow(sdl->g_win); #else SDL_GL_SwapBuffers(); #endif