fix #5 possible ptr overflow in VMABuffer::set_data

ArrowMaxGithub · ArrowMaxGithub · commit ce02c19ec35e · 2025-07-27T12:37:31.000+02:00
diff --git a/src/error.rs b/src/error.rs
@@ -9,24 +9,34 @@ unsafe impl Sync for Error {}
 pub enum Error {
     #[error("corresponding function loader was not loaded: {0}")]
     FnLoaderNotInitialized(String),
+
     #[error("called function which requires a head on headless instance")]
     HeadCallOnHeadlessInstance,
+
     #[error("no suitable GPU was found to create the physical device")]
     NoSuitableGPUFound,
+
     #[error("device extension was requested but is not supported: {0}")]
     RequiredDeviceExtensionNotSupported(String),
+
     #[error("requested surface format is not supported by the surface")]
     RequestedSurfaceFormatNotSupported,
+
     #[error("more frames in flight were requested than the surface supports")]
     InsufficientFramesInFlightSupported,
+
     #[error("requested present mode is not supported by the surface")]
     PresentModeNotSupported,
 
     #[error("the requested image layout transition is not supported from: {0:?} to: {1:?}")]
     UnsupportedImageLayoutTransition(ImageLayout, ImageLayout),
+
     #[error("tried to set data on an unmapped buffer")]
     WriteAttemptToUnmappedBuffer,
 
+    #[error("tried to write past the length of mapped buffer. Buffer allocation size: {0:?} bytes. Write offset: {1:?} bytes. Write length: {2:?} bytes")]
+    WriteAttemptOverflow(usize, usize, usize),
+
     #[error("the file extension of the shader could not be handled")]
     UnknownShaderFileExtension,
 
diff --git a/src/vma_buffer.rs b/src/vma_buffer.rs
@@ -179,6 +179,10 @@ impl VMABuffer {
             return Err(Error::WriteAttemptToUnmappedBuffer);
         };
 
+        if offset + data.len() > self.allocation.size() as usize / size_of::<T>(){
+            return Err(Error::WriteAttemptOverflow(self.allocation.size() as usize, offset, data.len() * size_of::<T>()));
+        }
+
         let mut ptr = ptr.as_ptr() as *mut T;
         unsafe {
             ptr = ptr.add(offset);
