From c1f9d7b49835c395db9c466d1d992ee5bda0cd72 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 5 Jun 2016 19:02:13 +0200 Subject: [PATCH] (shader_glsl.c) Fix dereference after null check warnings --- gfx/drivers_shader/shader_glsl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index 07be78dd6d..9bac8608ef 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -732,7 +732,7 @@ static void *gl_glsl_init(void *data, const char *path) if (!glsl->shader) goto error; - if (path) + if (!string_is_empty(path)) { bool ret = false; const char *path_ext = path_get_extension(path); @@ -772,7 +772,8 @@ static void *gl_glsl_init(void *data, const char *path) glsl->shader->modern = true; } - video_shader_resolve_relative(glsl->shader, path); + if (!string_is_empty(path)) + video_shader_resolve_relative(glsl->shader, path); video_shader_resolve_parameters(conf, glsl->shader); if (conf) @@ -1321,7 +1322,8 @@ static bool gl_glsl_set_coords(void *handle_data, void *shader_data, const struc return true; fallback: - gl_ff_vertex(coords); + if (coords) + gl_ff_vertex(coords); return false; }