@@ -60,6 +60,7 @@ Release 1.5.3 (2014-05-xx)
 - added GH #313: MetaColumn additions for Data::ODBC and Data::SQLite
 - fixed GH #346: Make Poco::Data::Date and Poco::Data::Time compare functions const.
 - fixed GH #341: Compiling poco-1.5.2 for Cygwin
+- fixed GH #305: There are bugs in Buffer.h
 
 Release 1.5.2 (2013-09-16)
 ==========================
 
@@ -142,7 +142,7 @@ class Buffer
 		{
 			T* ptr = new T[newCapacity];
 			if (preserveContent)
-				std::memcpy(ptr, _ptr, _used);
+				std::memcpy(ptr, _ptr, _used * sizeof(T));
 
 			delete [] _ptr;
 			_ptr = ptr;
@@ -171,7 +171,10 @@ class Buffer
 		{
 			T* ptr = new T[newCapacity];
 			if (preserveContent)
-				std::memcpy(ptr, _ptr, _used < newCapacity ? _used : newCapacity);
+			{
+				std::size_t newSz = _used < newCapacity ? _used : newCapacity;
+				std::memcpy(ptr, _ptr, newSz * sizeof(T));
+			}
 
 			delete [] _ptr;
 			_ptr = ptr;
@@ -187,7 +190,7 @@ class Buffer
 	{
 		if (0 == sz) return;
 		if (sz > _capacity) resize(sz, false);
-		std::memcpy(_ptr, buf, sz);
+		std::memcpy(_ptr, buf, sz * sizeof(T));
 		_used = sz;
 	}
 
@@ -196,7 +199,7 @@ class Buffer
 	{
 		if (0 == sz) return;
 		resize(_used + sz, true);
-		std::memcpy(_ptr + _used - sz, buf, sz);
+		std::memcpy(_ptr + _used - sz, buf, sz * sizeof(T));
 	}
 
 	void append(T val)
@@ -241,7 +244,7 @@ class Buffer
 		{
 			if (_used == other._used)
 			{
-				if (std::memcmp(_ptr, other._ptr, _used) == 0)
+				if (std::memcmp(_ptr, other._ptr, _used * sizeof(T)) == 0)
 				{
 					return true;
 				}
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ class Buffer`
`142`	`142`	`{`
`143`	`143`	`T* ptr = new T[newCapacity];`
`144`	`144`	`if (preserveContent)`
`145`		`- std::memcpy(ptr, _ptr, _used);`
	`145`	`+ std::memcpy(ptr, _ptr, _used * sizeof(T));`
`146`	`146`
`147`	`147`	`delete [] _ptr;`
`148`	`148`	`_ptr = ptr;`
`@@ -171,7 +171,10 @@ class Buffer`
`171`	`171`	`{`
`172`	`172`	`T* ptr = new T[newCapacity];`
`173`	`173`	`if (preserveContent)`
`174`		`- std::memcpy(ptr, _ptr, _used < newCapacity ? _used : newCapacity);`
	`174`	`+ {`
	`175`	`+ std::size_t newSz = _used < newCapacity ? _used : newCapacity;`
	`176`	`+ std::memcpy(ptr, _ptr, newSz * sizeof(T));`
	`177`	`+ }`
`175`	`178`
`176`	`179`	`delete [] _ptr;`
`177`	`180`	`_ptr = ptr;`
`@@ -187,7 +190,7 @@ class Buffer`
`187`	`190`	`{`
`188`	`191`	`if (0 == sz) return;`
`189`	`192`	`if (sz > _capacity) resize(sz, false);`
`190`		`- std::memcpy(_ptr, buf, sz);`
	`193`	`+ std::memcpy(_ptr, buf, sz * sizeof(T));`
`191`	`194`	`_used = sz;`
`192`	`195`	`}`
`193`	`196`
`@@ -196,7 +199,7 @@ class Buffer`
`196`	`199`	`{`
`197`	`200`	`if (0 == sz) return;`
`198`	`201`	`resize(_used + sz, true);`
`199`		`- std::memcpy(_ptr + _used - sz, buf, sz);`
	`202`	`+ std::memcpy(_ptr + _used - sz, buf, sz * sizeof(T));`
`200`	`203`	`}`
`201`	`204`
`202`	`205`	`void append(T val)`
`@@ -241,7 +244,7 @@ class Buffer`
`241`	`244`	`{`
`242`	`245`	`if (_used == other._used)`
`243`	`246`	`{`
`244`		`- if (std::memcmp(_ptr, other._ptr, _used) == 0)`
	`247`	`+ if (std::memcmp(_ptr, other._ptr, _used * sizeof(T)) == 0)`
`245`	`248`	`{`
`246`	`249`	`return true;`
`247`	`250`	`}`