commit 620f348faf3ce0c39e71338a005f1528765f4d1e
author Marco Nelissen <marcone@google.com> Mon Jun 23 19:48:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 23 19:48:55 2014 +0000
tree ec59a47e23d0178a172eccd6bc951b15b2db04d5
parent 7f76c50257f131cb26c1c21ede2622cb7ad534bf
parent da69fdbbeb79885a3c063a2017bd6d2848fcc312

am da69fdbb: Merge "Fix buffer allocation"

* commit 'da69fdbbeb79885a3c063a2017bd6d2848fcc312':
  Fix buffer allocation

media/mtp/MtpDataPacket.cpp

diff --git a/media/mtp/MtpDataPacket.cpp b/media/mtp/MtpDataPacket.cpp
index c4f87a0..e6e19e3 100644
--- a/media/mtp/MtpDataPacket.cpp
+++ b/media/mtp/MtpDataPacket.cpp
@@ -363,7 +363,7 @@
 }
 
 int MtpDataPacket::writeData(int fd, void* data, uint32_t length) {
-    allocate(length);
+    allocate(length + MTP_CONTAINER_HEADER_SIZE);
     memcpy(mBuffer + MTP_CONTAINER_HEADER_SIZE, data, length);
     length += MTP_CONTAINER_HEADER_SIZE;
     MtpPacket::putUInt32(MTP_CONTAINER_LENGTH_OFFSET, length);