From 186fbeec365e8dcb1fc0adc9f2298ef986748645 Mon Sep 17 00:00:00 2001 From: Yanchi Toth Date: Wed, 7 Aug 2019 17:13:57 +0200 Subject: [PATCH] Validate bind group buffer ranges (#268) * Validate bind group buffer range The bound buffer range must fit in the the buffer size. --- wgpu-native/src/device.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/wgpu-native/src/device.rs b/wgpu-native/src/device.rs index 139fa8f85..f1fb5e8f7 100644 --- a/wgpu-native/src/device.rs +++ b/wgpu-native/src/device.rs @@ -1152,7 +1152,17 @@ pub fn device_create_bind_group( .buffers .use_extend(&*buffer_guard, bb.buffer, (), usage) .unwrap(); - let range = Some(bb.offset) .. Some(bb.offset + bb.size); + + let start = bb.offset; + let end = bb.offset + bb.size; + assert!( + end <= buffer.size, + "Bound buffer range {:?} does not fit in buffer size {}", + start .. end, + buffer.size + ); + + let range = Some(start) .. Some(end); hal::pso::Descriptor::Buffer(&buffer.raw, range) } binding_model::BindingResource::Sampler(id) => {