Fix bug memcpy call in a template.

cosin15 · Jan 12, 2025 · 3031239 · 3031239
1 parent d15214a
commit 3031239
Showing 1 changed file with 28 additions and 20 deletions.
diff --git a/src/util/pointer.h b/src/util/pointer.h
@@ -36,10 +36,12 @@ class Buffer
 	Buffer(unsigned int size)
 	{
 		m_size = size;
-		if(size != 0)
+		if(size != 0) {
 			data = new T[size];
-		else
+		}
+		else {
 			data = nullptr;
+		}
 	}
 
 	// Disable class copy
@@ -62,10 +64,9 @@ class Buffer
 	Buffer(const T *t, unsigned int size)
 	{
 		m_size = size;
-		if(size != 0)
-		{
+		if(size != 0) {
 			data = new T[size];
-			memcpy(data, t, size);
+			memcpy(data, t, sizeof(T) * size);
 		}
 		else
 			data = nullptr;
@@ -82,14 +83,14 @@ class Buffer
 			return *this;
 		drop();
 		m_size = buffer.m_size;
-		if(m_size != 0)
-		{
+		if(m_size != 0) {
 			data = buffer.data;
 			buffer.data = nullptr;
 			buffer.m_size = 0;
 		}
-		else
+		else {
 			data = nullptr;
+		}
 		return *this;
 	}
 
@@ -99,7 +100,7 @@ class Buffer
 		buffer.m_size = m_size;
 		if (m_size != 0) {
 			buffer.data = new T[m_size];
-			memcpy(buffer.data, data, m_size);
+			memcpy(buffer.data, data, sizeof(T) * m_size);
 		} else {
 			buffer.data = nullptr;
 		}
@@ -156,12 +157,15 @@ class SharedBuffer
 	SharedBuffer(unsigned int size)
 	{
 		m_size = size;
-		if(m_size != 0)
+		if(m_size != 0) {
 			data = new T[m_size];
-		else
+		}
+		else {
 			data = nullptr;
+		}
+
 		refcount = new unsigned int;
-		memset(data,0,sizeof(T)*m_size);
+		memset(data, 0, sizeof(T) * m_size);
 		(*refcount) = 1;
 	}
 	SharedBuffer(const SharedBuffer &buffer)
@@ -173,8 +177,10 @@ class SharedBuffer
 	}
 	SharedBuffer & operator=(const SharedBuffer & buffer)
 	{
-		if(this == &buffer)
+		if(this == &buffer) {
 			return *this;
+		}
+
 		drop();
 		m_size = buffer.m_size;
 		data = buffer.data;
@@ -188,13 +194,13 @@ class SharedBuffer
 	SharedBuffer(const T *t, unsigned int size)
 	{
 		m_size = size;
-		if(m_size != 0)
-		{
+		if(m_size != 0) {
 			data = new T[m_size];
-			memcpy(data, t, m_size);
+			memcpy(data, t, sizeof(T) * m_size);
 		}
-		else
+		else {
 			data = nullptr;
+		}
 		refcount = new unsigned int;
 		(*refcount) = 1;
 	}
@@ -205,11 +211,13 @@ class SharedBuffer
 	{
 		m_size = buffer.getSize();
 		if (m_size != 0) {
-				data = new T[m_size];
-				memcpy(data, *buffer, buffer.getSize());
+			data = new T[m_size];
+			memcpy(data, *buffer, sizeof(T) * m_size);
 		}
-		else
+		else {
 			data = nullptr;
+		}
+
 		refcount = new unsigned int;
 		(*refcount) = 1;
 	}