openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-11-30 02:51:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nir/opt_deref: don't try to cast empty structures

Browse Source 
Found while running valgrind :

==3583454== Invalid read of size 4
==3583454==    at 0xF48336: glsl_get_struct_field_offset (nir_types.cpp:84)
==3583454==    by 0xC7CD0D: opt_replace_struct_wrapper_cast (nir_deref.c:1068)
==3583454==    by 0xC7CDD9: opt_deref_cast (nir_deref.c:1087)
==3583454==    by 0xC7DD8E: nir_opt_deref_impl (nir_deref.c:1369)
==3583454==    by 0xC7DF4E: nir_opt_deref (nir_deref.c:1428)
==3583454==    by 0xA63F3C: brw_kernel_from_spirv (brw_kernel.c:325)
==3583454==    by 0xA3BC2C: main (intel_clc.c:481)
==3583454==  Address 0xe4f7e88 is 24 bytes after a block of size 48 in arena "client"

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: mesa-stable
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13952>
(cherry picked from commit 8e568d3f00)
This commit is contained in:
Lionel Landwerlin 2021-11-16 14:25:08 +02:00 committed by Eric Engestrom
parent 16e281c4aa
commit 04ccbf5fea
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@ -5341,7 +5341,7 @@
"description": "nir/opt_deref: don't try to cast empty structures",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

4
src/compiler/nir/nir_deref.c
View File

@ -1052,6 +1052,10 @@ opt_replace_struct_wrapper_cast(nir_builder *b, nir_deref_instr *cast)
if (!glsl_type_is_struct(parent->type))
return false;
/* Empty struct */
if (glsl_get_length(parent->type) < 1)
return false;
if (glsl_get_struct_field_offset(parent->type, 0) != 0)
return false;