From: Joshua Simmons <josh@nega.tv>
Date: Sat, 4 Oct 2025 20:55:39 +0000 (+0200)
Subject: narcissus-core: Remove unsafe refs from virtual_vec
X-Git-Url: https://git.nega.tv//gitweb.cgi?a=commitdiff_plain;h=5bd4a9b5a187eca195245c1ab18830ae0f4df020;p=josh%2Fnarcissus

narcissus-core: Remove unsafe refs from virtual_vec
---

diff --git a/engine/narcissus-core/src/virtual_vec/vec.rs b/engine/narcissus-core/src/virtual_vec/vec.rs
index 23535da..345ae48 100644
--- a/engine/narcissus-core/src/virtual_vec/vec.rs
+++ b/engine/narcissus-core/src/virtual_vec/vec.rs
@@ -58,21 +58,26 @@ impl<T> VirtualVec<T> {
         }
     }
 
-    pub fn append(&mut self, other: &mut Self) {
-        unsafe {
-            self.append_elements(other.as_slice() as _);
-            other.set_len(0);
-        }
-    }
+    pub fn append(&mut self, src: &mut Self) {
+        let src_len = src.len();
+        let dst_len = self.len();
+
+        // Addition here cannot overflow as both len's are less-than `isize::MAX`
+        let new_len = dst_len + src_len;
+
+        // Will panic if additional size is beyond the max capacity.
+        self.reserve(src_len);
 
-    #[inline]
-    unsafe fn append_elements(&mut self, other: *const [T]) {
         unsafe {
-            let count = (*other).len();
-            self.reserve(count);
-            let len = self.len();
-            ptr::copy_nonoverlapping(other as *const T, self.as_mut_ptr().add(len), count);
-            self.len += count;
+            // SAFETY: Cannot be out of bounds as VirtualVec len cannot exceed
+            // `isize::MAX`.
+            let dst_ptr = self.as_mut_ptr().add(dst_len);
+            let src_ptr = src.as_ptr();
+
+            src.set_len(0);
+            ptr::copy_nonoverlapping(src_ptr, dst_ptr, src_len);
+
+            self.set_len(new_len);
         }
     }