Browse Source

Make `LocalVector` -> `Vector` automatic conversion safe for non-trivial types.

Lukas Tenbrink 7 months ago
parent
commit
0e32f3b957
1 changed files with 8 additions and 2 deletions
  1. 8 2
      core/templates/local_vector.h

+ 8 - 2
core/templates/local_vector.h

@@ -295,10 +295,16 @@ public:
 
 
 	operator Vector<T>() const {
 	operator Vector<T>() const {
 		Vector<T> ret;
 		Vector<T> ret;
-		ret.resize(size());
+		ret.resize(count);
 		T *w = ret.ptrw();
 		T *w = ret.ptrw();
 		if (w) {
 		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;
 		return ret;
 	}
 	}