jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Fix crash when pixel or vertex shader are missing

Browse Source 
Checks that the token is not null while looping. Logs errors when pixel
or vertex shader are missing.
This commit is contained in:
Alex Anderson
2018-10-20 04:22:55 -07:00
parent 047e586eaf
commit fc97512f71
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libobs/graphics/effect-parser.c
View File

@@ -1556,6 +1556,9 @@ static void ep_makeshaderstring(struct effect_parser *ep,
dstr_init(&call_str);
if (!token)
return;
while (token->type != CFTOKEN_NONE && is_whitespace(*token->str.array))
token++;
@@ -1755,13 +1758,17 @@ static bool ep_compile_pass(struct effect_parser *ep,
pass->section = EFFECT_PASS;
if (!ep_compile_pass_shader(ep, tech, pass, pass_in, idx,
GS_SHADER_VERTEX))
GS_SHADER_VERTEX)) {
success = false;
blog(LOG_ERROR, "Pass (%i) <%s> missing vertex shader!",
idx, pass->name ? pass->name : "");
}
if (!ep_compile_pass_shader(ep, tech, pass, pass_in, idx,
GS_SHADER_PIXEL))
GS_SHADER_PIXEL)) {
success = false;
blog(LOG_ERROR, "Pass (%i) <%s> missing pixel shader!",
idx, pass->name ? pass->name : "");
}
return success;
}