From e682133d2db949c836736add9c3cd671a702470f Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 9 Jun 2023 12:34:53 +0200 Subject: [PATCH] Fix use of nullptr field to calculate array size Is probably harmless in practice, but the ASAN was generating an error about it: draw_manager_data.cc:187:59: runtime error: member access within null pointer of type 'struct DRWUniformChunk' Pull Request: https://projects.blender.org/blender/blender/pulls/108798 --- source/blender/draw/intern/draw_manager_data.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc index 7cc698fa46f..141041ea21c 100644 --- a/source/blender/draw/intern/draw_manager_data.cc +++ b/source/blender/draw/intern/draw_manager_data.cc @@ -184,7 +184,7 @@ static void drw_shgroup_uniform_create_ex(DRWShadingGroup *shgroup, /* Happens on first uniform or if chunk is full. */ if (!unichunk || unichunk->uniform_used == unichunk->uniform_len) { unichunk = static_cast(BLI_memblock_alloc(DST.vmempool->uniforms)); - unichunk->uniform_len = ARRAY_SIZE(shgroup->uniforms->uniforms); + unichunk->uniform_len = BOUNDED_ARRAY_TYPE_SIZEuniforms->uniforms)>(); unichunk->uniform_used = 0; BLI_LINKS_PREPEND(shgroup->uniforms, unichunk); }