mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-07 12:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

(shader_glsl.c) Fix dereference after null check warnings

Browse Source
This commit is contained in:
twinaphex 2016-06-05 19:02:13 +02:00
parent 553ff7f69f
commit c1f9d7b498
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/drivers_shader/shader_glsl.c
View File

@ -732,7 +732,7 @@ static void *gl_glsl_init(void *data, const char *path)
if (!glsl->shader) if (!glsl->shader)
goto error; goto error;
if (path) if (!string_is_empty(path))
{ {
bool ret = false; bool ret = false;
const char *path_ext = path_get_extension(path); 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; 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); video_shader_resolve_parameters(conf, glsl->shader);
if (conf) if (conf)
@ -1321,7 +1322,8 @@ static bool gl_glsl_set_coords(void *handle_data, void *shader_data, const struc
return true; return true;
fallback: fallback:
gl_ff_vertex(coords); if (coords)
gl_ff_vertex(coords);
return false; return false;
} }