blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Fix T75625: crash on exit in macOS after selecting objects 

This code to free shaders by casting a struct to a pointer array is not valid
in general, and particularly when compiling with Clang (on Linux and macOS) it
fails and can read invalid/uninitialized memory .
This commit is contained in:
Brecht Van Lommel 2020-04-22 13:42:28 +02:00
parent 3542c5eb72
commit aba78caa11
Notes: blender-bot 2023-02-14 02:27:51 +01:00 
Referenced by issue #75625, MacOS: Blender quits but with Problem Error Report: "Blender quit unexpectedly"
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/draw/engines/gpencil/gpencil_shader.c
View File

@ -77,10 +77,33 @@ static struct {
void GPENCIL_shader_free(void)
{
GPUShader **sh_data_as_array = (GPUShader **)&g_shaders;
for (int i = 0; i < (sizeof(g_shaders) / sizeof(GPUShader *)); i++) {
DRW_SHADER_FREE_SAFE(sh_data_as_array[i]);
}
DRW_SHADER_FREE_SAFE(g_shaders.antialiasing_sh[0]);
DRW_SHADER_FREE_SAFE(g_shaders.antialiasing_sh[1]);
DRW_SHADER_FREE_SAFE(g_shaders.antialiasing_sh[2]);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_sh);
DRW_SHADER_FREE_SAFE(g_shaders.composite_sh);
DRW_SHADER_FREE_SAFE(g_shaders.layer_blend_sh);
DRW_SHADER_FREE_SAFE(g_shaders.depth_merge_sh);
DRW_SHADER_FREE_SAFE(g_shaders.mask_invert_sh);
DRW_SHADER_FREE_SAFE(g_shaders.fx_composite_sh);
DRW_SHADER_FREE_SAFE(g_shaders.fx_colorize_sh);
DRW_SHADER_FREE_SAFE(g_shaders.fx_blur_sh);
DRW_SHADER_FREE_SAFE(g_shaders.fx_glow_sh);
DRW_SHADER_FREE_SAFE(g_shaders.fx_pixel_sh);
DRW_SHADER_FREE_SAFE(g_shaders.fx_rim_sh);
DRW_SHADER_FREE_SAFE(g_shaders.fx_shadow_sh);
DRW_SHADER_FREE_SAFE(g_shaders.fx_transform_sh);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_fill_sh);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_stroke_sh);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_point_sh);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_edit_point_sh);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_line_sh);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_drawing_fill_sh);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_fullscreen_sh);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_simple_fullscreen_sh);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_blend_fullscreen_sh);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_background_sh);
DRW_SHADER_FREE_SAFE(g_shaders.gpencil_paper_sh);
}
GPUShader *GPENCIL_shader_antialiasing(int stage)