Deploying to master from @ gfx-rs/wgpu@e711a35 🚀

Author: Wumpf

doc/search-index.js

@@ -717,6 +717,60 @@
 <a href="#716" id="716">716</a>
 <a href="#717" id="717">717</a>
 <a href="#718" id="718">718</a>
+<a href="#719" id="719">719</a>
+<a href="#720" id="720">720</a>
+<a href="#721" id="721">721</a>
+<a href="#722" id="722">722</a>
+<a href="#723" id="723">723</a>
+<a href="#724" id="724">724</a>
+<a href="#725" id="725">725</a>
+<a href="#726" id="726">726</a>
+<a href="#727" id="727">727</a>
+<a href="#728" id="728">728</a>
+<a href="#729" id="729">729</a>
+<a href="#730" id="730">730</a>
+<a href="#731" id="731">731</a>
+<a href="#732" id="732">732</a>
+<a href="#733" id="733">733</a>
+<a href="#734" id="734">734</a>
+<a href="#735" id="735">735</a>
+<a href="#736" id="736">736</a>
+<a href="#737" id="737">737</a>
+<a href="#738" id="738">738</a>
+<a href="#739" id="739">739</a>
+<a href="#740" id="740">740</a>
+<a href="#741" id="741">741</a>
+<a href="#742" id="742">742</a>
+<a href="#743" id="743">743</a>
+<a href="#744" id="744">744</a>
+<a href="#745" id="745">745</a>
+<a href="#746" id="746">746</a>
+<a href="#747" id="747">747</a>
+<a href="#748" id="748">748</a>
+<a href="#749" id="749">749</a>
+<a href="#750" id="750">750</a>
+<a href="#751" id="751">751</a>
+<a href="#752" id="752">752</a>
+<a href="#753" id="753">753</a>
+<a href="#754" id="754">754</a>
+<a href="#755" id="755">755</a>
+<a href="#756" id="756">756</a>
+<a href="#757" id="757">757</a>
+<a href="#758" id="758">758</a>
+<a href="#759" id="759">759</a>
+<a href="#760" id="760">760</a>
+<a href="#761" id="761">761</a>
+<a href="#762" id="762">762</a>
+<a href="#763" id="763">763</a>
+<a href="#764" id="764">764</a>
+<a href="#765" id="765">765</a>
+<a href="#766" id="766">766</a>
+<a href="#767" id="767">767</a>
+<a href="#768" id="768">768</a>
+<a href="#769" id="769">769</a>
+<a href="#770" id="770">770</a>
+<a href="#771" id="771">771</a>
+<a href="#772" id="772">772</a>
 </pre></div><pre class="rust"><code><span class="kw">use </span>std::{
     error, fmt,
     ops::{Bound, Deref, DerefMut, Range, RangeBounds},
@@ -961,6 +1015,7 @@
     /// end of the buffer.
     </span><span class="kw">pub fn </span>slice&lt;S: RangeBounds&lt;BufferAddress&gt;&gt;(<span class="kw-2">&amp;</span><span class="self">self</span>, bounds: S) -&gt; BufferSlice&lt;<span class="lifetime">'_</span>&gt; {
         <span class="kw">let </span>(offset, size) = range_to_offset_size(bounds);
+        check_buffer_bounds(<span class="self">self</span>.size, offset, size);
         BufferSlice {
             buffer: <span class="self">self</span>,
             offset,
@@ -1392,6 +1447,31 @@
     }
 }
 
+<span class="kw">fn </span>check_buffer_bounds(
+    buffer_size: BufferAddress,
+    offset: BufferAddress,
+    size: <span class="prelude-ty">Option</span>&lt;BufferSize&gt;,
+) {
+    <span class="comment">// A slice of length 0 is invalid, so the offset must not be equal to or greater than the buffer size.
+    </span><span class="kw">if </span>offset &gt;= buffer_size {
+        <span class="macro">panic!</span>(
+            <span class="string">"slice offset {} is out of range for buffer of size {}"</span>,
+            offset, buffer_size
+        );
+    }
+
+    <span class="kw">if let </span><span class="prelude-val">Some</span>(size) = size {
+        <span class="comment">// Detect integer overflow.
+        </span><span class="kw">let </span>end = offset.checked_add(size.get());
+        <span class="kw">if </span>end.map_or(<span class="bool-val">true</span>, |end| end &gt; buffer_size) {
+            <span class="macro">panic!</span>(
+                <span class="string">"slice offset {} size {} is out of range for buffer of size {}"</span>,
+                offset, size, buffer_size
+            );
+        }
+    }
+}
+
 <span class="kw">fn </span>range_to_offset_size&lt;S: RangeBounds&lt;BufferAddress&gt;&gt;(
     bounds: S,
 ) -&gt; (BufferAddress, <span class="prelude-ty">Option</span>&lt;BufferSize&gt;) {
@@ -1409,9 +1489,10 @@
 
     (offset, size)
 }
+
 <span class="attr">#[cfg(test)]
 </span><span class="kw">mod </span>tests {
-    <span class="kw">use super</span>::{range_to_offset_size, BufferSize};
+    <span class="kw">use super</span>::{check_buffer_bounds, range_to_offset_size, BufferSize};
 
     <span class="attr">#[test]
     </span><span class="kw">fn </span>range_to_offset_size_works() {
@@ -1434,5 +1515,32 @@
     </span><span class="kw">fn </span>range_to_offset_size_panics_for_unbounded_empty_range() {
         range_to_offset_size(..<span class="number">0</span>);
     }
+
+    <span class="attr">#[test]
+    #[should_panic]
+    </span><span class="kw">fn </span>check_buffer_bounds_panics_for_offset_at_size() {
+        check_buffer_bounds(<span class="number">100</span>, <span class="number">100</span>, <span class="prelude-val">None</span>);
+    }
+
+    <span class="attr">#[test]
+    </span><span class="kw">fn </span>check_buffer_bounds_works_for_end_in_range() {
+        check_buffer_bounds(<span class="number">200</span>, <span class="number">100</span>, BufferSize::new(<span class="number">50</span>));
+        check_buffer_bounds(<span class="number">200</span>, <span class="number">100</span>, BufferSize::new(<span class="number">100</span>));
+        check_buffer_bounds(u64::MAX, u64::MAX - <span class="number">100</span>, BufferSize::new(<span class="number">100</span>));
+        check_buffer_bounds(u64::MAX, <span class="number">0</span>, BufferSize::new(u64::MAX));
+        check_buffer_bounds(u64::MAX, <span class="number">1</span>, BufferSize::new(u64::MAX - <span class="number">1</span>));
+    }
+
+    <span class="attr">#[test]
+    #[should_panic]
+    </span><span class="kw">fn </span>check_buffer_bounds_panics_for_end_over_size() {
+        check_buffer_bounds(<span class="number">200</span>, <span class="number">100</span>, BufferSize::new(<span class="number">101</span>));
+    }
+
+    <span class="attr">#[test]
+    #[should_panic]
+    </span><span class="kw">fn </span>check_buffer_bounds_panics_for_end_wraparound() {
+        check_buffer_bounds(u64::MAX, <span class="number">1</span>, BufferSize::new(u64::MAX));
+    }
 }
 </code></pre></div></section></main></body></html>