Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1

Browse Source
This commit is contained in:
Mike Lockwood
2011-03-14 09:43:14 -07:00
committed by Android (Google) Code Review
parent 7ea3c7f5a3 90f5d75cf0
commit 3ec9d06f07
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/mtp/MtpDevice.cpp
View File

@@ -819,6 +819,10 @@ MtpResponseCode MtpDevice::readResponse() {
return mResponse.getResponseCode(); return mResponse.getResponseCode();
} }
int ret = mResponse.read(mRequestIn1); int ret = mResponse.read(mRequestIn1);
// handle zero length packets, which might occur if the data transfer
// ends on a packet boundary
if (ret == 0)
ret = mResponse.read(mRequestIn1);
if (ret >= MTP_CONTAINER_HEADER_SIZE) { if (ret >= MTP_CONTAINER_HEADER_SIZE) {
mResponse.dump(); mResponse.dump();
return mResponse.getResponseCode(); return mResponse.getResponseCode();