commit 7a1e1bdde7a28d9573367d6f95b736fd793ace0c
author Mike Lockwood <lockwood@android.com> Tue Nov 30 09:21:19 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 30 09:21:19 2010 -0800
tree 04eeba1892ca5b44413e73df7256e2d6ee062f0b
parent de42783c730b211abba8d949c955d6defb854739
parent 1d34b4b921cdac91116e456d97b57a1931e9e335

Merge "MTP: Make sure buffer is big enough before reading the data packet"

media/mtp/MtpDataPacket.cpp

diff --git a/media/mtp/MtpDataPacket.cpp b/media/mtp/MtpDataPacket.cpp
index e1d1a92..eac1f7e 100644
--- a/media/mtp/MtpDataPacket.cpp
+++ b/media/mtp/MtpDataPacket.cpp
@@ -351,6 +351,7 @@
         return -1;
     // then the following data
     int total = MtpPacket::getUInt32(MTP_CONTAINER_LENGTH_OFFSET);
+    allocate(total);
     int remaining = total - MTP_CONTAINER_HEADER_SIZE;
     ret = ::read(fd, &mBuffer[0] + MTP_CONTAINER_HEADER_SIZE, remaining);
     if (ret != remaining)