Make LocalVector -> Vector automatic conversion safe for non-triv…

…ial types.
Ivorforce · Dec 21, 2024 · 0e32f3b · 0e32f3b
1 parent 89001f9
commit 0e32f3b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/core/templates/local_vector.h b/core/templates/local_vector.h
@@ -295,10 +295,16 @@ class LocalVector {
 
 	operator Vector<T>() const {
 		Vector<T> ret;
-		ret.resize(size());
+		ret.resize(count);
 		T *w = ret.ptrw();
 		if (w) {
-			memcpy(w, data, sizeof(T) * count);
+			if constexpr (std::is_trivially_copyable_v<T>) {
+				memcpy(w, data, sizeof(T) * count);
+			} else {
+				for (U i = 0; i < count; i++) {
+					w[i] = data[i];
+				}
+			}
 		}
 		return ret;
 	}