commit c27f5259cf2c45ea6f0a021fc17578f32f6c2f7d
author Marco Nelissen <marcone@google.com> Mon Jun 23 19:54:07 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 23 19:54:07 2014 +0000
tree 86ce7864cb48f85e5b26307d23554965ccfb14c2
parent 215ebcddf7216d15fde34f9a32d27f280d1b19d3
parent 620f348faf3ce0c39e71338a005f1528765f4d1e

am 620f348f: am da69fdbb: Merge "Fix buffer allocation"

* commit '620f348faf3ce0c39e71338a005f1528765f4d1e':
  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);