OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rusticl/spirv: protect against 0 length in slice::from_raw_parts

Browse Source 
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11584
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30410>
This commit is contained in:
Karol Herbst
2024-07-29 14:42:11 +02:00
committed by Marge Bot
parent 81f75e2a2d
commit dc2755a4f8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/frontends/rusticl/mesa/compiler/clc/spirv.rs
View File

@@ -224,8 +224,10 @@ impl SPIRVBin {
fn kernel_infos(&self) -> &[clc_kernel_info] { fn kernel_infos(&self) -> &[clc_kernel_info] {
match self.info { match self.info {
None => &[], Some(info) if info.num_kernels > 0 => unsafe {
Some(info) => unsafe { slice::from_raw_parts(info.kernels, info.num_kernels as usize) }, slice::from_raw_parts(info.kernels, info.num_kernels as usize)
},
_ => &[],
} }
} }
@@ -407,6 +409,10 @@ impl SPIRVBin {
pub fn spec_constant(&self, spec_id: u32) -> Option<clc_spec_constant_type> { pub fn spec_constant(&self, spec_id: u32) -> Option<clc_spec_constant_type> {
let info = self.info?; let info = self.info?;
if info.num_spec_constants == 0 {
return None;
}
let spec_constants = let spec_constants =
unsafe { slice::from_raw_parts(info.spec_constants, info.num_spec_constants as usize) }; unsafe { slice::from_raw_parts(info.spec_constants, info.num_spec_constants as usize) };