[Bf-blender-cvs] [b435bd2f318] master: Fix potential draw manager assignment to negative index
Campbell Barton
noreply at git.blender.org
Sun Mar 15 12:06:08 CET 2020
Commit: b435bd2f3189e3b7bfdde043442927bbd8f06116
Author: Campbell Barton
Date: Sun Mar 15 21:55:42 2020 +1100
Branches: master
https://developer.blender.org/rBb435bd2f3189e3b7bfdde043442927bbd8f06116
Fix potential draw manager assignment to negative index
While there is an assert here, the run-time code would perform the assignment.
===================================================================
M source/blender/draw/intern/draw_manager_shader.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c
index 7b08f44921f..7f9a6f578b7 100644
--- a/source/blender/draw/intern/draw_manager_shader.c
+++ b/source/blender/draw/intern/draw_manager_shader.c
@@ -558,13 +558,12 @@ void DRW_shader_library_add_file(DRWShaderLibrary *lib, char *lib_code, const ch
if (index > -1) {
lib->libs[index] = lib_code;
BLI_strncpy(lib->libs_name[index], lib_name, MAX_LIB_NAME);
+ lib->libs_deps[index] = drw_shader_dependencies_get(lib, lib_code);
}
else {
printf("Error: Too many libraries. Cannot add %s.\n", lib_name);
BLI_assert(0);
}
-
- lib->libs_deps[index] = drw_shader_dependencies_get(lib, lib_code);
}
/* Return an allocN'ed string containing the shader code with its dependencies prepended.
More information about the Bf-blender-cvs
mailing list