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

…ial types.
Ivorforce · Dec 21, 2024 · e87f64f · e87f64f
1 parent 24a8c05
commit e87f64f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/core/templates/local_vector.h b/core/templates/local_vector.h
@@ -295,9 +295,16 @@ class LocalVector {
 
 	operator Vector<T>() const {
 		Vector<T> ret;
-		ret.resize(size());
+		ret.resize(count);
 		T *w = ret.ptrw();
-		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;
 	}