Rework ByteArray::resize() to keep buffer data

include/bytearray.h

@@ -156,10 +156,12 @@ namespace gourou
 	unsigned int size() const {return length();}
 
 	/**
-	 * @brief Create a new internal buffer of length bytes
+	 * @brief Increase or decrease internal buffer
-	 * All previous data is lost
+	 * @param length New length of internal buffer
+	 * @param keepData If true copy old data on new buffer, if false,
+	 * create a new buffer with random data
 	 */
-	void resize(unsigned int length);
+	void resize(unsigned int length, bool keepData=true);
 
 	ByteArray& operator=(const ByteArray& other);
 	

src/bytearray.cpp

@@ -172,7 +172,28 @@ namespace gourou
 
     void ByteArray::append(const unsigned char* data, unsigned int length)
     {
-	unsigned char* oldData = _data;
+	if (!length)
+	    return;
+	
+	unsigned int oldLength = _length;
+
+	resize(_length+length, true);
+
+	memcpy(&_data[oldLength], data, length);	
+    }
+    
+    void ByteArray::append(unsigned char c) { append(&c, 1);}
+    void ByteArray::append(const char* str) { append((const unsigned char*)str, strlen(str));}
+    void ByteArray::append(const std::string& str) { append((const unsigned char*)str.c_str(), str.length()); }
+
+    void ByteArray::resize(unsigned length, bool keepData)
+    {
+	if (length == _length)
+	    return;
+	else if (length < _length)
+	    _length = length ; // Don't touch data
+	else // New size >
+	{
 	    unsigned char* newData;
 
 	    if (_useMalloc)
@@ -180,25 +201,15 @@ namespace gourou
 	    else
 		newData = new unsigned char[_length+length];
 
-	memcpy(newData, oldData, _length);
+	    if (keepData)
+		memcpy(newData, _data, _length);
 	
 	    delRef();
 
-	memcpy(&newData[_length], data, length);
+	    _length = length;
-	_length += length;
-	
 	    _data = newData;
 	
 	    addRef();
 	}
-    
-    void ByteArray::append(unsigned char c) { append(&c, 1);}
-    void ByteArray::append(const char* str) { append((const unsigned char*)str, strlen(str));}
-    void ByteArray::append(const std::string& str) { append((const unsigned char*)str.c_str(), str.length()); }
-
-    void ByteArray::resize(unsigned length)
-    {
-	delRef();
-	initData(0, length);
     }
 }