openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adbd: don't spin if file sync read fails." 

am: 32d2eae8b9

Change-Id: Ie104bb8ea8d67b5a7ce896d2237a44cc8ea1ab4f
This commit is contained in:
Josh Gao 2017-08-28 21:16:13 +00:00 committed by android-build-merger
parent c39a5082dc 32d2eae8b9
commit 4dc1892491
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
adb/file_sync_service.cpp
View File

@ -283,25 +283,25 @@ fail:
// reading and throwing away ID_DATA packets until the other side notices
// that we've reported an error.
while (true) {
if (!ReadFdExactly(s, &msg.data, sizeof(msg.data))) goto fail;
if (!ReadFdExactly(s, &msg.data, sizeof(msg.data))) break;
if (msg.data.id == ID_DONE) {
goto abort;
break;
} else if (msg.data.id != ID_DATA) {
char id[5];
memcpy(id, &msg.data.id, sizeof(msg.data.id));
id[4] = '\0';
D("handle_send_fail received unexpected id '%s' during failure", id);
goto abort;
break;
}
if (msg.data.size > buffer.size()) {
D("handle_send_fail received oversized packet of length '%u' during failure",
msg.data.size);
goto abort;
break;
}
if (!ReadFdExactly(s, &buffer[0], msg.data.size)) goto abort;
if (!ReadFdExactly(s, &buffer[0], msg.data.size)) break;
}
abort: