intel/compiler: Fix dynarray usage in intel_clc

The code builds up the dynamic array of objects (spirv_objs) and
collect pointers to each of them into another dynamic
array (spirv_ptr_objs).

If the growth of the first array cause a reallocation, it is
possible that the previous pointers end up invalid.

Fixes: 77e929a527 ("intel/clc: allow multiple CL files to be compiled together")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19730>
This commit is contained in:
Caio Oliveira
2022-11-13 22:30:25 -08:00
committed by Marge Bot
parent 71c4543af1
commit 9fd1d47aa0

View File

@@ -450,8 +450,10 @@ int main(int argc, char **argv)
ralloc_free(mem_ctx);
return 1;
}
}
util_dynarray_append(&spirv_ptr_objs, struct clc_binary *, spirv_out);
util_dynarray_foreach(&spirv_objs, struct clc_binary, p) {
util_dynarray_append(&spirv_ptr_objs, struct clc_binary *, p);
}
/* The SPIRV-Tools linker started checking that all modules have the same