elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-24 20:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: check memory boundaries before using slice::from_raw_parts

Browse Source
This commit is contained in:
Julius 2024-05-13 17:12:36 -07:00 committed by Jonathan Spira
parent 80a4683be7
commit 1d06e2c049
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
imgui/src/render/draw_data.rs
View File

@ -56,9 +56,12 @@ impl DrawData {
} }
#[inline] #[inline]
pub(crate) unsafe fn cmd_lists(&self) -> &[*const DrawList] { pub(crate) unsafe fn cmd_lists(&self) -> &[*const DrawList] {
if self.cmd_lists_count <= 0 || self.cmd_lists.is_null() {
return &[];
}
slice::from_raw_parts( slice::from_raw_parts(
self.cmd_lists as *const *const DrawList, self.cmd_lists as *const *const DrawList,
self.cmd_lists_count as usize, self.cmd_lists_count as usize
) )
} }
/// Converts all buffers from indexed to non-indexed, in case you cannot render indexed /// Converts all buffers from indexed to non-indexed, in case you cannot render indexed
@ -146,23 +149,39 @@ impl RawWrapper for DrawList {
impl DrawList { impl DrawList {
#[inline] #[inline]
pub(crate) unsafe fn cmd_buffer(&self) -> &[sys::ImDrawCmd] { pub(crate) unsafe fn cmd_buffer(&self) -> &[sys::ImDrawCmd] {
slice::from_raw_parts( unsafe {
self.0.CmdBuffer.Data as *const sys::ImDrawCmd, if self.0.CmdBuffer.Size <= 0 || self.0.CmdBuffer.Data.is_null() {
self.0.CmdBuffer.Size as usize, return &[];
) }
slice::from_raw_parts(
self.0.CmdBuffer.Data as *const sys::ImDrawCmd,
self.0.CmdBuffer.Size as usize,
)
}
} }
#[inline] #[inline]
pub fn idx_buffer(&self) -> &[DrawIdx] { pub fn idx_buffer(&self) -> &[DrawIdx] {
unsafe { unsafe {
if self.0.IdxBuffer.Size <= 0 || self.0.IdxBuffer.Data.is_null() {
return &[];
}
slice::from_raw_parts( slice::from_raw_parts(
self.0.IdxBuffer.Data as *const DrawIdx, self.0.IdxBuffer.Data as *const DrawIdx,
self.0.IdxBuffer.Size as usize, self.0.IdxBuffer.Size as usize,
) )
} }
} }
#[inline] #[inline]
pub fn vtx_buffer(&self) -> &[DrawVert] { pub fn vtx_buffer(&self) -> &[DrawVert] {
unsafe { unsafe {
if self.0.VtxBuffer.Size <= 0 || self.0.VtxBuffer.Data.is_null() {
return &[];
}
slice::from_raw_parts( slice::from_raw_parts(
self.0.VtxBuffer.Data as *const DrawVert, self.0.VtxBuffer.Data as *const DrawVert,
self.0.VtxBuffer.Size as usize, self.0.VtxBuffer.Size as usize,
@ -181,7 +200,14 @@ impl DrawList {
core::mem::size_of::<DrawVert>(), core::mem::size_of::<DrawVert>(),
); );
assert!(core::mem::align_of::<VTy>() <= core::mem::align_of::<DrawVert>()); assert!(core::mem::align_of::<VTy>() <= core::mem::align_of::<DrawVert>());
slice::from_raw_parts(self.0.VtxBuffer.Data.cast(), self.0.VtxBuffer.Size as usize) if self.0.VtxBuffer.Size <= 0 || self.0.VtxBuffer.Data.is_null() {
return &[];
}
slice::from_raw_parts(
self.0.VtxBuffer.Data as *const VTy,
self.0.VtxBuffer.Size as usize,
)
} }
#[inline] #[inline]