Fix the wrong padding of ByteVector::resize().

The expanded area will be filled with garbage instead of correct padding in some corner cases.

diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
index 4ae40666b5a60ecc56c8bfeb34727279caef4ec8..bf6c525ff56a60e4a1db4220fe40d2344c12afb8 100644 (file)
--- a/taglib/toolkit/tbytevector.cpp
+++ b/taglib/toolkit/tbytevector.cpp
@@ -702,6 +702,7 @@ ByteVector &ByteVector::resize(uint size, char padding)
 {
   if(size != d->length) {
     detach();
+    d->data->data.resize(d->offset + d->length);
     d->data->data.resize(d->offset + size, padding);
     d->length = size;
   }

diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp
index c68a8c340648c7a219fff82173cac5795e73d2a3..e9d43c0520a55d0eee5087ae70618f47bec55012 100644 (file)
--- a/tests/test_bytevector.cpp
+++ b/tests/test_bytevector.cpp
@@ -123,6 +123,12 @@ public:
     CPPUNIT_ASSERT(i.containsAt(j, 5, 0));
     CPPUNIT_ASSERT(i.containsAt(j, 6, 1));
     CPPUNIT_ASSERT(i.containsAt(j, 6, 1, 3));
+
+    ByteVector k = ByteVector("0123456789").mid(3, 4);
+    k.resize(6, 'A');
+    CPPUNIT_ASSERT_EQUAL(uint(6), k.size());
+    CPPUNIT_ASSERT_EQUAL('6', k[3]);
+    CPPUNIT_ASSERT_EQUAL('A', k[4]);
   }
 
   void testFind1()